From 7516b059fe888555bb7f770bec6c88718dac3d57 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Tue, 6 Mar 2018 11:31:56 +0900 Subject: [PATCH] Code style fixes --- atom/browser/atom_javascript_dialog_manager.cc | 18 ++++++++---------- atom/browser/atom_javascript_dialog_manager.h | 1 + atom/browser/web_contents_preferences.cc | 6 +++--- atom/browser/web_contents_preferences.h | 6 +++--- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/atom/browser/atom_javascript_dialog_manager.cc b/atom/browser/atom_javascript_dialog_manager.cc index 5c95b02288..34253e8b92 100644 --- a/atom/browser/atom_javascript_dialog_manager.cc +++ b/atom/browser/atom_javascript_dialog_manager.cc @@ -17,12 +17,14 @@ using content::JavaScriptDialogType; -namespace { - constexpr int USER_WANTS_NO_MORE_DIALOGS = -1; -} - namespace atom { +namespace { + +constexpr int kUserWantsNoMoreDialogs = -1; + +} // namespace + AtomJavaScriptDialogManager::AtomJavaScriptDialogManager( api::WebContents* api_web_contents) : api_web_contents_(api_web_contents) {} @@ -36,11 +38,7 @@ void AtomJavaScriptDialogManager::RunJavaScriptDialog( const DialogClosedCallback& callback, bool* did_suppress_message) { const std::string origin = origin_url.GetOrigin().spec(); - if (origin_counts_.find(origin) == origin_counts_.end()) { - origin_counts_[origin] = 0; - } - - if (origin_counts_[origin] == USER_WANTS_NO_MORE_DIALOGS) { + if (origin_counts_[origin] == kUserWantsNoMoreDialogs) { return callback.Run(false, base::string16()); } @@ -97,7 +95,7 @@ void AtomJavaScriptDialogManager::OnMessageBoxCallback( int code, bool checkbox_checked) { if (checkbox_checked) { - (*origin_counts_)[origin] = USER_WANTS_NO_MORE_DIALOGS; + (*origin_counts_)[origin] = kUserWantsNoMoreDialogs; } callback.Run(code == 0, base::string16()); } diff --git a/atom/browser/atom_javascript_dialog_manager.h b/atom/browser/atom_javascript_dialog_manager.h index 8a584218ab..7849d755c1 100644 --- a/atom/browser/atom_javascript_dialog_manager.h +++ b/atom/browser/atom_javascript_dialog_manager.h @@ -42,6 +42,7 @@ class AtomJavaScriptDialogManager : public content::JavaScriptDialogManager { std::map* origins_, int code, bool checkbox_checked); + api::WebContents* api_web_contents_; std::map origin_counts_; }; diff --git a/atom/browser/web_contents_preferences.cc b/atom/browser/web_contents_preferences.cc index 932da8f4a8..7951c36b45 100644 --- a/atom/browser/web_contents_preferences.cc +++ b/atom/browser/web_contents_preferences.cc @@ -301,13 +301,13 @@ bool WebContentsPreferences::GetInteger(const std::string& attributeName, return false; } -bool WebContentsPreferences::GetString(const std::string& attributeName, - std::string* stringValue, +bool WebContentsPreferences::GetString(const std::string& attribute_name, + std::string* string_value, content::WebContents* web_contents) { WebContentsPreferences* self = FromWebContents(web_contents); if (!self) return false; - return self->web_preferences()->GetString(attributeName, stringValue); + return self->web_preferences()->GetString(attribute_name, string_value); } } // namespace atom diff --git a/atom/browser/web_contents_preferences.h b/atom/browser/web_contents_preferences.h index 299c088174..5cc6bd97b2 100644 --- a/atom/browser/web_contents_preferences.h +++ b/atom/browser/web_contents_preferences.h @@ -40,9 +40,9 @@ class WebContentsPreferences static bool IsPreferenceEnabled(const std::string& attribute_name, content::WebContents* web_contents); - static bool GetString(const std::string& attributeName, - std::string* stringValue, - content::WebContents* web_contents); + static bool GetString(const std::string& attribute_name, + std::string* string_value, + content::WebContents* web_contents); // Modify the WebPreferences according to |web_contents|'s preferences. static void OverrideWebkitPrefs(