Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(729)

Unified Diff: chrome/browser/ui/browser.cc

Issue 11362250: Remove PrefObserver usages, batch 6. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Mac build. Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 3e3fd4781e5f16feded4f466e5b376271ef41a98..2c27b68e0f948801c80ae7d1091b7dbfa6908bab 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -396,9 +396,16 @@ Browser::Browser(const CreateParams& params)
content::NotificationService::AllSources());
profile_pref_registrar_.Init(profile_->GetPrefs());
- profile_pref_registrar_.Add(prefs::kDevToolsDisabled, this);
- profile_pref_registrar_.Add(prefs::kShowBookmarkBar, this);
- profile_pref_registrar_.Add(prefs::kHomePage, this);
+ profile_pref_registrar_.Add(
+ prefs::kDevToolsDisabled,
+ base::Bind(&Browser::OnDevToolsDisabledChanged, base::Unretained(this)));
+ profile_pref_registrar_.Add(
+ prefs::kShowBookmarkBar,
+ base::Bind(&Browser::UpdateBookmarkBarState, base::Unretained(this),
+ BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE));
+ profile_pref_registrar_.Add(
+ prefs::kHomePage,
+ base::Bind(&Browser::MarkHomePageAsChanged, base::Unretained(this)));
BrowserList::AddBrowser(this);
@@ -1942,20 +1949,6 @@ void Browser::Observe(int type,
}
}
-void Browser::OnPreferenceChanged(PrefServiceBase* service,
- const std::string& pref_name) {
- if (pref_name == prefs::kDevToolsDisabled) {
- if (profile_->GetPrefs()->GetBoolean(prefs::kDevToolsDisabled))
- content::DevToolsManager::GetInstance()->CloseAllClientHosts();
- } else if (pref_name == prefs::kShowBookmarkBar) {
- UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE);
- } else if (pref_name == prefs::kHomePage) {
- MarkHomePageAsChanged(static_cast<PrefService*>(service));
- } else {
- NOTREACHED();
- }
-}
-
void Browser::ModeChanged(const chrome::search::Mode& old_mode,
const chrome::search::Mode& new_mode) {
UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE);
@@ -1964,8 +1957,13 @@ void Browser::ModeChanged(const chrome::search::Mode& old_mode,
///////////////////////////////////////////////////////////////////////////////
// Browser, Command and state updating (private):
-void Browser::MarkHomePageAsChanged(PrefService* pref_service) {
- pref_service->SetBoolean(prefs::kHomePageChanged, true);
+void Browser::OnDevToolsDisabledChanged() {
+ if (profile_->GetPrefs()->GetBoolean(prefs::kDevToolsDisabled))
+ content::DevToolsManager::GetInstance()->CloseAllClientHosts();
+}
+
+void Browser::MarkHomePageAsChanged() {
+ profile_->GetPrefs()->SetBoolean(prefs::kHomePageChanged, true);
}
///////////////////////////////////////////////////////////////////////////////
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698