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

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

Issue 10677009: Move command handling and updating off Browser and onto a helper object. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 months 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/gtk/browser_toolbar_gtk.h ('k') | chrome/browser/ui/gtk/browser_window_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/browser_toolbar_gtk.cc
===================================================================
--- chrome/browser/ui/gtk/browser_toolbar_gtk.cc (revision 144460)
+++ chrome/browser/ui/gtk/browser_toolbar_gtk.cc (working copy)
@@ -104,10 +104,11 @@
window_(window) {
wrench_menu_model_.reset(new WrenchMenuModel(this, browser_));
- browser_->command_updater()->AddCommandObserver(IDC_BACK, this);
- browser_->command_updater()->AddCommandObserver(IDC_FORWARD, this);
- browser_->command_updater()->AddCommandObserver(IDC_HOME, this);
- browser_->command_updater()->AddCommandObserver(IDC_BOOKMARK_PAGE, this);
+
+ chrome::AddCommandObserver(browser_, IDC_BACK, this);
+ chrome::AddCommandObserver(browser_, IDC_FORWARD, this);
+ chrome::AddCommandObserver(browser_, IDC_HOME, this);
+ chrome::AddCommandObserver(browser_, IDC_BOOKMARK_PAGE, this);
registrar_.Add(this,
chrome::NOTIFICATION_UPGRADE_RECOMMENDED,
@@ -118,10 +119,10 @@
}
BrowserToolbarGtk::~BrowserToolbarGtk() {
- browser_->command_updater()->RemoveCommandObserver(IDC_BACK, this);
- browser_->command_updater()->RemoveCommandObserver(IDC_FORWARD, this);
- browser_->command_updater()->RemoveCommandObserver(IDC_HOME, this);
- browser_->command_updater()->RemoveCommandObserver(IDC_BOOKMARK_PAGE, this);
+ chrome::RemoveCommandObserver(browser_, IDC_BACK, this);
+ chrome::RemoveCommandObserver(browser_, IDC_FORWARD, this);
+ chrome::RemoveCommandObserver(browser_, IDC_HOME, this);
+ chrome::RemoveCommandObserver(browser_, IDC_BOOKMARK_PAGE, this);
offscreen_entry_.Destroy();
@@ -303,7 +304,7 @@
wrench_menu_->PopupAsFromKeyEvent(wrench_menu_button_->widget());
}
-// CommandUpdater::CommandObserver ---------------------------------------------
+// CommandObserver -------------------------------------------------------------
void BrowserToolbarGtk::EnabledStateChangedForCommand(int id, bool enabled) {
GtkWidget* widget = NULL;
« no previous file with comments | « chrome/browser/ui/gtk/browser_toolbar_gtk.h ('k') | chrome/browser/ui/gtk/browser_window_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698