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

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

Issue 11280115: Remove PrefObserver usages, batch 12. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix removal of PrefServiceObserver usage. Created 8 years 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_command_controller.h ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_command_controller.cc
diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
index f6ec7f5b1b43f3730b298c2525afae8b6d7402b3..25ad1c758740ab35819a0f17a9d53201ab9e4c4b 100644
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -159,16 +159,40 @@ BrowserCommandController::BrowserCommandController(Browser* browser)
PrefService* local_state = g_browser_process->local_state();
if (local_state) {
local_pref_registrar_.Init(local_state);
- local_pref_registrar_.Add(prefs::kAllowFileSelectionDialogs, this);
- local_pref_registrar_.Add(prefs::kInManagedMode, this);
+ local_pref_registrar_.Add(
+ prefs::kAllowFileSelectionDialogs,
+ base::Bind(
+ &BrowserCommandController::UpdateCommandsForFileSelectionDialogs,
+ base::Unretained(this)));
+ local_pref_registrar_.Add(
+ prefs::kInManagedMode,
+ base::Bind(
+ &BrowserCommandController::UpdateCommandsForMultipleProfiles,
+ base::Unretained(this)));
}
profile_pref_registrar_.Init(profile()->GetPrefs());
- profile_pref_registrar_.Add(prefs::kDevToolsDisabled, this);
- profile_pref_registrar_.Add(prefs::kEditBookmarksEnabled, this);
- profile_pref_registrar_.Add(prefs::kShowBookmarkBar, this);
- profile_pref_registrar_.Add(prefs::kIncognitoModeAvailability, this);
- profile_pref_registrar_.Add(prefs::kPrintingEnabled, this);
+ profile_pref_registrar_.Add(
+ prefs::kDevToolsDisabled,
+ base::Bind(&BrowserCommandController::UpdateCommandsForDevTools,
+ base::Unretained(this)));
+ profile_pref_registrar_.Add(
+ prefs::kEditBookmarksEnabled,
+ base::Bind(&BrowserCommandController::UpdateCommandsForBookmarkEditing,
+ base::Unretained(this)));
+ profile_pref_registrar_.Add(
+ prefs::kShowBookmarkBar,
+ base::Bind(&BrowserCommandController::UpdateCommandsForBookmarkBar,
+ base::Unretained(this)));
+ profile_pref_registrar_.Add(
+ prefs::kIncognitoModeAvailability,
+ base::Bind(
+ &BrowserCommandController::UpdateCommandsForIncognitoAvailability,
+ base::Unretained(this)));
+ profile_pref_registrar_.Add(
+ prefs::kPrintingEnabled,
+ base::Bind(&BrowserCommandController::UpdatePrintingState,
+ base::Unretained(this)));
InitCommandState();
@@ -684,32 +708,6 @@ void BrowserCommandController::Observe(
}
////////////////////////////////////////////////////////////////////////////////
-// PrefObserver implementation:
-
-void BrowserCommandController::OnPreferenceChanged(
- PrefServiceBase* service,
- const std::string& pref_name) {
- if (pref_name == prefs::kPrintingEnabled) {
- UpdatePrintingState();
- } else if (pref_name == prefs::kIncognitoModeAvailability) {
- UpdateCommandsForIncognitoAvailability();
- } else if (pref_name == prefs::kDevToolsDisabled) {
- UpdateCommandsForDevTools();
- } else if (pref_name == prefs::kEditBookmarksEnabled) {
- UpdateCommandsForBookmarkEditing();
- } else if (pref_name == prefs::kShowBookmarkBar) {
- UpdateCommandsForBookmarkBar();
- } else if (pref_name == prefs::kAllowFileSelectionDialogs) {
- UpdateSaveAsState();
- UpdateOpenFileState();
- } else if (pref_name == prefs::kInManagedMode) {
- UpdateCommandsForMultipleProfiles();
- } else {
- NOTREACHED();
- }
-}
-
-////////////////////////////////////////////////////////////////////////////////
// BrowserCommandController, TabStripModelObserver implementation:
void BrowserCommandController::TabInsertedAt(WebContents* contents,
@@ -1052,6 +1050,11 @@ void BrowserCommandController::UpdateCommandsForBookmarkBar() {
show_main_ui);
}
+void BrowserCommandController::UpdateCommandsForFileSelectionDialogs() {
+ UpdateSaveAsState();
+ UpdateOpenFileState();
+}
+
void BrowserCommandController::UpdateCommandsForFullscreenMode(
FullScreenMode fullscreen_mode) {
const bool show_main_ui =
« no previous file with comments | « chrome/browser/ui/browser_command_controller.h ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698