summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/browser_command_controller.h
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-30 20:08:02 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-30 20:08:02 +0000
commit0b085c40e699bd8bfcad31a9eb0303437f0c5e93 (patch)
tree56dee99bada0c6c2ece5613afbacd97776f64b8a /chrome/browser/ui/browser_command_controller.h
parent3a8d7fa918f77e913778628a988c5687cf0d9fa4 (diff)
downloadchromium_src-0b085c40e699bd8bfcad31a9eb0303437f0c5e93.zip
chromium_src-0b085c40e699bd8bfcad31a9eb0303437f0c5e93.tar.gz
chromium_src-0b085c40e699bd8bfcad31a9eb0303437f0c5e93.tar.bz2
Revert 170483 - Remove PrefObserver usages, batch 12.
TBR=ben@chromium.org BUG=155525 Review URL: https://chromiumcodereview.appspot.com/11280115 Reason for revert: A review comment after commit showed that the change is probably wrong (or at least changes behavior in a way that was not intended). Reverting for now, until there is time to figure out the correct change. TBR=joi@chromium.org Review URL: https://codereview.chromium.org/11308295 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170519 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_command_controller.h')
-rw-r--r--chrome/browser/ui/browser_command_controller.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/ui/browser_command_controller.h b/chrome/browser/ui/browser_command_controller.h
index e3f6afa..1d8e96c 100644
--- a/chrome/browser/ui/browser_command_controller.h
+++ b/chrome/browser/ui/browser_command_controller.h
@@ -6,6 +6,7 @@
#define CHROME_BROWSER_UI_BROWSER_COMMAND_CONTROLLER_H_
#include "base/prefs/public/pref_change_registrar.h"
+#include "base/prefs/public/pref_observer.h"
#include "chrome/browser/api/sync/profile_sync_service_observer.h"
#include "chrome/browser/command_updater.h"
#include "chrome/browser/sessions/tab_restore_service_observer.h"
@@ -27,6 +28,7 @@ namespace chrome {
class BrowserCommandController : public CommandUpdater::CommandUpdaterDelegate,
public content::NotificationObserver,
+ public PrefObserver,
public TabStripModelObserver,
public TabRestoreServiceObserver,
public ProfileSyncServiceObserver {
@@ -86,6 +88,10 @@ class BrowserCommandController : public CommandUpdater::CommandUpdaterDelegate,
const content::NotificationSource& source,
const content::NotificationDetails& details) OVERRIDE;
+ // Overridden from PrefObserver:
+ virtual void OnPreferenceChanged(PrefServiceBase* service,
+ const std::string& pref_name) OVERRIDE;
+
// Overridden from TabStripModelObserver:
virtual void TabInsertedAt(content::WebContents* contents,
int index,
@@ -133,10 +139,6 @@ class BrowserCommandController : public CommandUpdater::CommandUpdaterDelegate,
// Updates commands that affect the bookmark bar.
void UpdateCommandsForBookmarkBar();
- // Updates commands that affect file selection dialogs in aggregate,
- // namely the save-page-as state and the open-file state.
- void UpdateCommandsForFileSelectionDialogs();
-
// Update commands whose state depends on the type of fullscreen mode the
// window is in.
void UpdateCommandsForFullscreenMode(FullScreenMode fullscreen_mode);