MacViews: Remove GetMenu() from MenuRunner.

chrome/browser/ui/views/toolbar/browser_action_view.cc

 // Copyright 2013 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/toolbar/browser_action_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/extension_action.h"
@@ skipping 92 matching lines @@
                                          Browser* browser,
                                          BrowserActionView::Delegate* delegate)
     : MenuButton(this, base::string16(), NULL, false),
       browser_(browser),
       browser_action_(
           extensions::ExtensionActionManager::Get(browser->profile())->
           GetBrowserAction(*extension)),
       extension_(extension),
       icon_factory_(browser->profile(), extension, browser_action_, this),
       delegate_(delegate),
-      context_menu_(NULL),
       called_registered_extension_command_(false),
       icon_observer_(NULL) {
   SetHorizontalAlignment(gfx::ALIGN_CENTER);
   set_context_menu_controller(this);
 
   // No UpdateState() here because View hierarchy not setup yet. Our parent
   // should call UpdateState() after creation.
 
   content::NotificationSource notification_source =
       content::Source<Profile>(browser_->profile()->GetOriginalProfile());
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED,
                  content::Source<ExtensionAction>(browser_action_));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_COMMAND_ADDED,
                  notification_source);
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_COMMAND_REMOVED,
                  notification_source);
 
   // We also listen for browser theme changes on linux because a switch from or
   // to GTK requires that we regrab our browser action images.
   registrar_.Add(
       this,
       chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
       content::Source<ThemeService>(
           ThemeServiceFactory::GetForProfile(browser->profile())));
 }
 
 void BrowserActionButton::Destroy() {
   MaybeUnregisterExtensionCommand(false);
 
-  if (context_menu_) {
-    context_menu_->Cancel();
+  if (menu_runner_) {
+    menu_runner_->Cancel();
     base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
   } else {
     delete this;
   }
 }
 
 void BrowserActionButton::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (details.is_add && !called_registered_extension_command_ &&
       GetFocusManager()) {
@@ skipping 45 matching lines @@
     // already visible menu, in this case the Chrome menu.
     parent = BrowserView::GetBrowserViewForBrowser(browser_)->toolbar()
                                                             ->app_menu()
                                                             ->GetWidget();
   } else {
     parent = GetWidget();
   }
 
   menu_runner_.reset(
       new views::MenuRunner(context_menu_contents.get(), run_types));
-  context_menu_ = menu_runner_->GetMenu();
 
   if (menu_runner_->RunMenuAt(parent,
                               NULL,
                               gfx::Rect(screen_loc, size()),
                               views::MENU_ANCHOR_TOPLEFT,
                               source_type) ==
       views::MenuRunner::MENU_DELETED) {
     return;
   }
 
   menu_runner_.reset();
   SetButtonNotPushed();
-  context_menu_ = NULL;
 }
 
 void BrowserActionButton::UpdateState() {
   int tab_id = delegate_->GetCurrentTabId();
   if (tab_id < 0)
     return;
 
   if (!IsEnabled(tab_id)) {
     SetState(views::CustomButton::STATE_DISABLED);
   } else {
@@ skipping 101 matching lines @@
   if (!views::View::ShouldShowContextMenuOnMousePress()) {
     // See comments in MenuButton::Activate() as to why this is needed.
     SetMouseHandler(NULL);
 
     ShowContextMenu(gfx::Point(), ui::MENU_SOURCE_MOUSE);
   }
   return false;
 }
 
 void BrowserActionButton::OnMouseReleased(const ui::MouseEvent& event) {
-  if (IsPopup() || context_menu_) {
+  if (IsPopup() || menu_runner_) {
     // TODO(erikkay) this never actually gets called (probably because of the
     // loss of focus).
     MenuButton::OnMouseReleased(event);
   } else {
     LabelButton::OnMouseReleased(event);
   }
 }
 
 void BrowserActionButton::OnMouseExited(const ui::MouseEvent& event) {
-  if (IsPopup() || context_menu_)
+  if (IsPopup() || menu_runner_)
     MenuButton::OnMouseExited(event);
   else
     LabelButton::OnMouseExited(event);
 }
 
 bool BrowserActionButton::OnKeyReleased(const ui::KeyEvent& event) {
   return IsPopup() ? MenuButton::OnKeyReleased(event) :
                      LabelButton::OnKeyReleased(event);
 }
 
@@ skipping 82 matching lines @@
   extensions::Command browser_action_command;
   if (!only_if_active || !command_service->GetBrowserActionCommand(
           extension_->id(),
           extensions::CommandService::ACTIVE_ONLY,
           &browser_action_command,
           NULL)) {
     GetFocusManager()->UnregisterAccelerator(*keybinding_.get(), this);
     keybinding_.reset(NULL);
   }
 }