fix: about panel is a base::Value::Dict

electron · Feb 21, 2023 · b66da76 · b66da76
1 parent 32c60b2
commit b66da76
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/shell/browser/browser.h b/shell/browser/browser.h
@@ -363,7 +363,7 @@ class Browser : public WindowListObserver {
   base::Time last_dock_show_;
 #endif
 
-  base::Value about_panel_options_;
+  base::Value::Dict about_panel_options_;
 
 #if BUILDFLAG(IS_WIN)
   void UpdateBadgeContents(HWND hwnd,

diff --git a/shell/browser/browser_mac.mm b/shell/browser/browser_mac.mm
@@ -513,8 +513,7 @@ bool CheckLoginItemStatus(bool* is_hidden) {
 }
 
 void Browser::ShowAboutPanel() {
-  NSDictionary* options =
-      DictionaryValueToNSDictionary(about_panel_options_.GetDict());
+  NSDictionary* options = DictionaryValueToNSDictionary(about_panel_options_);
 
   // Credits must be a NSAttributedString instead of NSString
   NSString* credits = (NSString*)options[@"Credits"];
@@ -537,13 +536,13 @@ bool CheckLoginItemStatus(bool* is_hidden) {
 }
 
 void Browser::SetAboutPanelOptions(base::Value::Dict options) {
-  about_panel_options_.GetDict().clear();
+  about_panel_options_.clear();
 
   for (const auto pair : options) {
     std::string key = pair.first;
     if (!key.empty() && pair.second.is_string()) {
       key[0] = base::ToUpperASCII(key[0]);
-      about_panel_options_.GetDict().Set(key, pair.second.Clone());
+      about_panel_options_.Set(key, pair.second.Clone());
     }
   }
 }

diff --git a/spec/api-app-spec.ts b/spec/api-app-spec.ts
@@ -1966,6 +1966,19 @@ describe('default behavior', () => {
       }
     });
   });
+
+  describe('about panel', () => {
+    it('app.setAboutPanelOptions() does not crash', () => {
+      app.setAboutPanelOptions({
+        applicationName: 'electron!!',
+        version: '1.2.3'
+      });
+    });
+
+    it('app.showAboutPanel() does not crash', () => {
+      app.showAboutPanel();
+    });
+  });
 });
 
 async function runTestApp (name: string, ...args: any[]) {