content: convert zoom notifications to observer usage

chrome/browser/ui/gtk/browser_toolbar_gtk.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/browser_toolbar_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <X11/XF86keysym.h>
 
@@ skipping 81 matching lines @@
 }  // namespace
 
 // BrowserToolbarGtk, public ---------------------------------------------------
 
 BrowserToolbarGtk::BrowserToolbarGtk(Browser* browser, BrowserWindowGtk* window)
     : toolbar_(NULL),
       location_bar_(new LocationBarViewGtk(browser)),
       model_(browser->toolbar_model()),
       is_wrench_menu_model_valid_(true),
       browser_(browser),
-      window_(window) {
+      window_(window),
+      zoom_callback_(base::Bind(&BrowserToolbarGtk::OnZoomLevelChanged,
+                                base::Unretained(this))) {
   wrench_menu_model_.reset(new WrenchMenuModel(this, browser_, false, false));
 
   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,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
                  chrome::NOTIFICATION_GLOBAL_ERRORS_CHANGED,
                  content::Source<Profile>(browser_->profile()));
 }
 
 BrowserToolbarGtk::~BrowserToolbarGtk() {
   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();
 
   wrench_menu_.reset();
+
+  HostZoomMap::GetForBrowserContext(
+      browser()->profile())->RemoveZoomLevelChangedCallback(zoom_callback_);
 }
 
 void BrowserToolbarGtk::Init(GtkWindow* top_level_window) {
   Profile* profile = browser_->profile();
   theme_service_ = GtkThemeService::GetFrom(profile);
   registrar_.Add(this,
                  chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  content::Source<ThemeService>(theme_service_));
 
   offscreen_entry_.Own(gtk_entry_new());
@@ skipping 97 matching lines @@
   GtkWidget* wrench_box = gtk_alignment_new(0, 0, 1, 1);
   g_signal_connect_after(wrench_box, "expose-event",
                          G_CALLBACK(OnWrenchMenuButtonExposeThunk), this);
   gtk_container_add(GTK_CONTAINER(wrench_box), wrench_button);
   gtk_box_pack_start(GTK_BOX(toolbar_), wrench_box, FALSE, FALSE, 4);
 
   wrench_menu_.reset(new MenuGtk(this, wrench_menu_model_.get()));
   // The bookmark menu model needs to be able to force the wrench menu to close.
   wrench_menu_model_->bookmark_sub_menu_model()->SetMenuGtk(wrench_menu_.get());
 
-  registrar_.Add(this, content::NOTIFICATION_ZOOM_LEVEL_CHANGED,
-      content::Source<HostZoomMap>(
-          HostZoomMap::GetForBrowserContext(profile)));
+  HostZoomMap::GetForBrowserContext(
+      browser()->profile())->AddZoomLevelChangedCallback(zoom_callback_);
 
   if (ShouldOnlyShowLocation()) {
     gtk_widget_show(event_box_);
     gtk_widget_show(alignment_);
     gtk_widget_show(toolbar_);
     gtk_widget_show_all(location_hbox_);
     gtk_widget_hide(reload_->widget());
   } else {
     gtk_widget_show_all(event_box_);
     if (actions_toolbar_->button_count() == 0)
@@ skipping 152 matching lines @@
           theme_service_->GetRTLEnabledPixbufNamed(IDR_TOOLS));
     }
 
     UpdateRoundedness();
   } else if (type == chrome::NOTIFICATION_UPGRADE_RECOMMENDED) {
     // Redraw the wrench menu to update the badge.
     gtk_widget_queue_draw(wrench_menu_button_->widget());
   } else if (type == chrome::NOTIFICATION_GLOBAL_ERRORS_CHANGED) {
     is_wrench_menu_model_valid_ = false;
     gtk_widget_queue_draw(wrench_menu_button_->widget());
-  } else if (type == content::NOTIFICATION_ZOOM_LEVEL_CHANGED) {
-    // Since BrowserToolbarGtk create a new |wrench_menu_model_| in
-    // RebuildWrenchMenu(), the ordering of the observers of
-    // NOTIFICATION_ZOOM_LEVEL_CHANGED can change, and result in subtle bugs
-    // like http://crbug.com/118823. Rather than depending on the ordering
-    // of the notification observers, always update the WrenchMenuModel before
-    // updating the WrenchMenu.
-    wrench_menu_model_->UpdateZoomControls();
-
-    // If our zoom level changed, we need to tell the menu to update its state,
-    // since the menu could still be open.
-    wrench_menu_->UpdateMenu();
   } else {
     NOTREACHED();
   }
 }
 
 // BrowserToolbarGtk, public ---------------------------------------------------
 
 void BrowserToolbarGtk::UpdateWebContents(WebContents* contents,
                                           bool should_restore_state) {
   location_bar_->Update(should_restore_state ? contents : NULL);
 
   if (actions_toolbar_.get())
     actions_toolbar_->Update();
 }
 
 bool BrowserToolbarGtk::IsWrenchMenuShowing() const {
   return wrench_menu_.get() && gtk_widget_get_visible(wrench_menu_->widget());
 }
 
 // BrowserToolbarGtk, private --------------------------------------------------
 
+void BrowserToolbarGtk::OnZoomLevelChanged(const std::string& host) {
+  // Since BrowserToolbarGtk create a new |wrench_menu_model_| in
+  // RebuildWrenchMenu(), the ordering of the observers of HostZoomMap
+  // can change, and result in subtle bugs like http://crbug.com/118823.
+  // Rather than depending on the ordering of the observers, always update
+  // the WrenchMenuModel before updating the WrenchMenu.
+  wrench_menu_model_->UpdateZoomControls();
+
+  // If our zoom level changed, we need to tell the menu to update its state,
+  // since the menu could still be open.
+  wrench_menu_->UpdateMenu();
+}
+
+
 void BrowserToolbarGtk::SetUpDragForHomeButton() {
   if (!home_page_.IsManaged() && !home_page_is_new_tab_page_.IsManaged()) {
     gtk_drag_dest_set(home_->widget(), GTK_DEST_DEFAULT_ALL,
                       NULL, 0, GDK_ACTION_COPY);
     static const int targets[] = { ui::TEXT_PLAIN, ui::TEXT_URI_LIST, -1 };
     ui::SetDestTargetList(home_->widget(), targets);
 
     drop_handler_.reset(new ui::GtkSignalRegistrar());
     drop_handler_->Connect(home_->widget(), "drag-data-received",
                            G_CALLBACK(OnDragDataReceivedThunk), this);
@@ skipping 235 matching lines @@
                       allocation.x + x_offset,
                       allocation.y + y_offset);
 
   return FALSE;
 }
 
 void BrowserToolbarGtk::UpdateShowHomeButton() {
   bool visible = show_home_button_.GetValue() && !ShouldOnlyShowLocation();
   gtk_widget_set_visible(home_->widget(), visible);
 }