Convert zoom callbacks to use CallbackRegistry

chrome/browser/ui/views/wrench_menu.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/views/wrench_menu.h"
 
 #include <algorithm>
 #include <cmath>
 #include <set>
 
@@ skipping 510 matching lines @@
 class WrenchMenu::ZoomView : public WrenchMenuView {
  public:
   ZoomView(WrenchMenu* menu,
            MenuModel* menu_model,
            const ui::NativeTheme* native_theme,
            int decrement_index,
            int increment_index,
            int fullscreen_index)
       : WrenchMenuView(menu, menu_model),
         fullscreen_index_(fullscreen_index),
-        zoom_callback_(base::Bind(&WrenchMenu::ZoomView::OnZoomLevelChanged,
-                                  base::Unretained(this))),
         increment_button_(NULL),
         zoom_label_(NULL),
         decrement_button_(NULL),
         fullscreen_button_(NULL),
         zoom_label_width_(0) {
-    HostZoomMap::GetForBrowserContext(
-        menu->browser_->profile())->AddZoomLevelChangedCallback(zoom_callback_);
+    zoom_subscription_ = HostZoomMap::GetForBrowserContext(
+        menu->browser_->profile())->AddZoomLevelChangedCallback(
+            base::Bind(&WrenchMenu::ZoomView::OnZoomLevelChanged,
+                       base::Unretained(this)));
 
     decrement_button_ = CreateButtonWithAccName(
         IDS_ZOOM_MINUS2, MenuButtonBackground::LEFT_BUTTON, decrement_index,
         NULL, IDS_ACCNAME_ZOOM_MINUS2);
 
     zoom_label_ = new Label(
         l10n_util::GetStringFUTF16Int(IDS_ZOOM_PERCENT, 100));
     zoom_label_->SetAutoColorReadabilityEnabled(false);
     zoom_label_->SetHorizontalAlignment(gfx::ALIGN_RIGHT);
 
@@ skipping 57 matching lines @@
         new MenuButtonBackground(MenuButtonBackground::SINGLE_BUTTON,
                                  menu->use_new_menu()));
     fullscreen_button_->SetAccessibleName(
         GetAccessibleNameForWrenchMenuItem(
             menu_model, fullscreen_index, IDS_ACCNAME_FULLSCREEN));
     AddChildView(fullscreen_button_);
 
     UpdateZoomControls();
   }
 
-  virtual ~ZoomView() {
-    Shutdown();
-  }
+  virtual ~ZoomView() {}
 
   // Overridden from View.
   virtual gfx::Size GetPreferredSize() OVERRIDE {
     // The increment/decrement button are forced to the same width.
     int button_width = std::max(increment_button_->GetPreferredSize().width(),
                                 decrement_button_->GetPreferredSize().width());
     int zoom_padding = menu()->use_new_menu() ?
         kTouchZoomPadding : kZoomPadding;
     int fullscreen_width = fullscreen_button_->GetPreferredSize().width() +
                            zoom_padding;
@@ skipping 35 matching lines @@
     if (sender->tag() == fullscreen_index_) {
       menu()->CancelAndEvaluate(menu_model(), sender->tag());
     } else {
       // Zoom buttons don't close the menu.
       menu_model()->ActivatedAt(sender->tag());
     }
   }
 
   // Overridden from WrenchMenuObserver.
   virtual void WrenchMenuDestroyed() OVERRIDE {
-    Shutdown();
     WrenchMenuView::WrenchMenuDestroyed();
   }
 
  private:
-  // Invoked from the destructor or when the WrenchMenu is destroyed.
-  void Shutdown() {
-    if (!menu())
-      return;
-
-    HostZoomMap::GetForBrowserContext(
-        menu()->browser_->profile())->RemoveZoomLevelChangedCallback(
-            zoom_callback_);
-  }
-
   void OnZoomLevelChanged(const HostZoomMap::ZoomLevelChange& change) {
     UpdateZoomControls();
   }
 
   void UpdateZoomControls() {
     bool enable_increment = false;
     bool enable_decrement = false;
     WebContents* selected_tab =
         menu()->browser_->tab_strip_model()->GetActiveWebContents();
     int zoom = 100;
@@ skipping 31 matching lines @@
       max_w = font.GetStringWidth(
           l10n_util::GetStringFUTF16Int(IDS_ZOOM_PERCENT, 100));
     }
 
     return max_w + border_width;
   }
 
   // Index of the fullscreen menu item in the model.
   const int fullscreen_index_;
 
-  content::HostZoomMap::ZoomLevelChangedCallback zoom_callback_;
+  scoped_ptr<content::HostZoomMap::Subscription> zoom_subscription_;
   content::NotificationRegistrar registrar_;
 
   // Button for incrementing the zoom.
   LabelButton* increment_button_;
 
   // Label showing zoom as a percent.
   Label* zoom_label_;
 
   // Button for decrementing the zoom.
   LabelButton* decrement_button_;
@@ skipping 515 matching lines @@
                                browser_,
                                parent,
                                first_bookmark_command_id_));
   bookmark_menu_delegate_->Init(this,
                                 bookmark_menu_,
                                 model->bookmark_bar_node(),
                                 0,
                                 BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS,
                                 BOOKMARK_LAUNCH_LOCATION_WRENCH_MENU);
 }