mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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
This commit is contained in:
Charles Kerr 2024-07-19 12:26:57 -05:00 committed by GitHub
parent 5b7ed6097e
commit 7a101a1c4b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
shell/browser/api/electron_api_web_contents.cc
View file

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

17
shell/browser/web_contents_preferences.cc
View file

@ -258,14 +258,6 @@ void WebContentsPreferences::SetFromDictionary(
SaveLastPreferences(); 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) { bool WebContentsPreferences::SetImageAnimationPolicy(std::string policy) {
if (policy == "animate") { if (policy == "animate") {
image_animation_policy_ = image_animation_policy_ =
@ -283,15 +275,6 @@ bool WebContentsPreferences::SetImageAnimationPolicy(std::string policy) {
return false; 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 { bool WebContentsPreferences::IsSandboxed() const {
if (sandbox_) if (sandbox_)
return *sandbox_; return *sandbox_;

7
shell/browser/web_contents_preferences.h
View file

@ -52,7 +52,7 @@ class WebContentsPreferences
void OverrideWebkitPrefs(blink::web_pref::WebPreferences* prefs, void OverrideWebkitPrefs(blink::web_pref::WebPreferences* prefs,
blink::RendererPreferences* renderer_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_; } bool IsOffscreen() const { return offscreen_; }
std::optional<SkColor> GetBackgroundColor() const { std::optional<SkColor> GetBackgroundColor() const {
@ -75,12 +75,9 @@ class WebContentsPreferences
bool AllowsNodeIntegrationInSubFrames() const { bool AllowsNodeIntegrationInSubFrames() const {
return node_integration_in_sub_frames_; 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 ShouldDisablePopups() const { return disable_popups_; }
bool IsWebSecurityEnabled() const { return web_security_; } bool IsWebSecurityEnabled() const { return web_security_; }
bool GetPreloadPath(base::FilePath* path) const; std::optional<base::FilePath> GetPreloadPath() const { return preload_path_; }
bool IsSandboxed() const; bool IsSandboxed() const;
private: private: