diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc index d9c74f551526..341c85b13aac 100644 --- a/shell/browser/api/electron_api_web_contents.cc +++ b/shell/browser/api/electron_api_web_contents.cc @@ -3614,9 +3614,8 @@ std::vector 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); } } diff --git a/shell/browser/web_contents_preferences.cc b/shell/browser/web_contents_preferences.cc index ad96e46b1b7a..27039cd6f0c5 100644 --- a/shell/browser/web_contents_preferences.cc +++ b/shell/browser/web_contents_preferences.cc @@ -259,14 +259,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_ = @@ -284,15 +276,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_; diff --git a/shell/browser/web_contents_preferences.h b/shell/browser/web_contents_preferences.h index dd89bfe39070..b134f1aa76b5 100644 --- a/shell/browser/web_contents_preferences.h +++ b/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 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 GetPreloadPath() const { return preload_path_; } bool IsSandboxed() const; private: