Browse Source

refactor: remove unused web contents preferences methods (#42947)

* chore: remove unused WebContentsPreferences::ShouldDisableDialogs()

* chore: remove unused WebContentsPreferences::ShouldUseSafeDialogs()

caller removed in 85bc005c

* chore: remove unused WebContentsPreferences::GetSafeDialogsMessage()

caller removed in 85bc005c

* refactor: WebContentsPreferences::GetPreloadPath() now returns a std::optional<base::FilePath>

* refactor: make WebContentsPreferences::last_preference() const
Charles Kerr 9 months ago
parent
commit
7a101a1c4b

+ 2 - 3
shell/browser/api/electron_api_web_contents.cc

@@ -3619,9 +3619,8 @@ std::vector<base::FilePath> WebContents::GetPreloadPaths() const {
   auto result = SessionPreferences::GetValidPreloads(GetBrowserContext());
 
   if (auto* web_preferences = WebContentsPreferences::From(web_contents())) {
-    base::FilePath preload;
-    if (web_preferences->GetPreloadPath(&preload)) {
-      result.emplace_back(preload);
+    if (auto preload = web_preferences->GetPreloadPath()) {
+      result.emplace_back(*preload);
     }
   }
 

+ 0 - 17
shell/browser/web_contents_preferences.cc

@@ -258,14 +258,6 @@ void WebContentsPreferences::SetFromDictionary(
   SaveLastPreferences();
 }
 
-bool WebContentsPreferences::GetSafeDialogsMessage(std::string* message) const {
-  if (safe_dialogs_message_) {
-    *message = *safe_dialogs_message_;
-    return true;
-  }
-  return false;
-}
-
 bool WebContentsPreferences::SetImageAnimationPolicy(std::string policy) {
   if (policy == "animate") {
     image_animation_policy_ =
@@ -283,15 +275,6 @@ bool WebContentsPreferences::SetImageAnimationPolicy(std::string policy) {
   return false;
 }
 
-bool WebContentsPreferences::GetPreloadPath(base::FilePath* path) const {
-  DCHECK(path);
-  if (preload_path_) {
-    *path = *preload_path_;
-    return true;
-  }
-  return false;
-}
-
 bool WebContentsPreferences::IsSandboxed() const {
   if (sandbox_)
     return *sandbox_;

+ 2 - 5
shell/browser/web_contents_preferences.h

@@ -52,7 +52,7 @@ class WebContentsPreferences
   void OverrideWebkitPrefs(blink::web_pref::WebPreferences* prefs,
                            blink::RendererPreferences* renderer_prefs);
 
-  base::Value* last_preference() { return &last_web_preferences_; }
+  const base::Value* last_preference() const { return &last_web_preferences_; }
 
   bool IsOffscreen() const { return offscreen_; }
   std::optional<SkColor> GetBackgroundColor() const {
@@ -75,12 +75,9 @@ class WebContentsPreferences
   bool AllowsNodeIntegrationInSubFrames() const {
     return node_integration_in_sub_frames_;
   }
-  bool ShouldDisableDialogs() const { return disable_dialogs_; }
-  bool ShouldUseSafeDialogs() const { return safe_dialogs_; }
-  bool GetSafeDialogsMessage(std::string* message) const;
   bool ShouldDisablePopups() const { return disable_popups_; }
   bool IsWebSecurityEnabled() const { return web_security_; }
-  bool GetPreloadPath(base::FilePath* path) const;
+  std::optional<base::FilePath> GetPreloadPath() const { return preload_path_; }
   bool IsSandboxed() const;
 
  private: