Extension context menu refactor

chrome/browser/views/browser_actions_container.cc

 // Copyright (c) 2010 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/views/browser_actions_container.h"
 
 #include "app/gfx/canvas.h"
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"
 #include "base/stl_util-inl.h"
@@ skipping 15 matching lines @@
 #include "chrome/browser/views/extensions/extension_popup.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "grit/app_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/button/text_button.h"
+#include "views/controls/menu/menu_2.h"
 #include "views/drag_utils.h"
 #include "views/window/window.h"
 
 #include "grit/theme_resources.h"
 
 namespace {
 
 // The size (both dimensions) of the buttons for page actions.
 static const int kButtonSize = 29;
 
@@ skipping 172 matching lines @@
   if (showing_context_menu_) {
     SetButtonPushed();
 
     // Get the top left point of this button in screen coordinates.
     gfx::Point point = gfx::Point(0, 0);
     ConvertPointToScreen(this, &point);
 
     // Make the menu appear below the button.
     point.Offset(0, height());
 
-    panel_->GetContextMenu()->Run(extension(), extension()->browser_action(),
-        panel_, panel_->profile()->GetPrefs(), point);
+    // Reconstructs the menu every time because the menu's contents are dynamic.
+    context_menu_contents_.reset(new ExtensionContextMenuModel(
+        extension(), panel_->browser(), panel_));
+    context_menu_menu_.reset(new views::Menu2(context_menu_contents_.get()));
+    context_menu_menu_->RunContextMenuAt(point);
 
     SetButtonNotPushed();
     return false;
   } else if (IsPopup()) {
     return MenuButton::OnMousePressed(e);
   }
   return TextButton::OnMousePressed(e);
 }
 
 void BrowserActionButton::OnMouseReleased(const views::MouseEvent& e,
@@ skipping 128 matching lines @@
     // how many icons we'll show and set initial size to that.
     predefined_width = IconCountToWidth(model_->size());
   }
   container_size_ = gfx::Size(predefined_width, kButtonSize);
 }
 
 BrowserActionsContainer::~BrowserActionsContainer() {
   if (model_)
     model_->RemoveObserver(this);
   StopShowFolderDropMenuTimer();
-  CloseMenus();
   HidePopup();
   DeleteBrowserActionViews();
 }
 
 // Static.
 void BrowserActionsContainer::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterIntegerPref(prefs::kBrowserActionContainerWidth, 0);
 }
 
 int BrowserActionsContainer::GetCurrentTabId() const {
   TabContents* tab_contents = browser_->GetSelectedTabContents();
   if (!tab_contents)
     return -1;
 
   return tab_contents->controller().session_id().id();
 }
 
-ExtensionActionContextMenu* BrowserActionsContainer::GetContextMenu() {
-  if (!context_menu_.get())
-    context_menu_.reset(new ExtensionActionContextMenu());
-  return context_menu_.get();
-}
-
 BrowserActionView* BrowserActionsContainer::GetBrowserActionView(
-    Extension* extension) {
+    ExtensionAction* action) {
   for (BrowserActionViews::iterator iter =
        browser_action_views_.begin(); iter != browser_action_views_.end();
        ++iter) {
-    if ((*iter)->button()->extension() == extension)
+    if ((*iter)->button()->browser_action() == action)
       return *iter;
   }
 
   return NULL;
 }
 
 void BrowserActionsContainer::RefreshBrowserActionViews() {
   for (size_t i = 0; i < browser_action_views_.size(); ++i)
     browser_action_views_[i]->button()->UpdateState();
 }
 
-void BrowserActionsContainer::CloseMenus() {
-  if (context_menu_.get())
-    context_menu_->Cancel();
-  // Close the overflow menu if open.
+void BrowserActionsContainer::CloseOverflowMenu() {
   if (overflow_menu_)
     overflow_menu_->CancelMenu();
 }
 
 void BrowserActionsContainer::StopShowFolderDropMenuTimer() {
   show_menu_task_factory_.RevokeAll();
 }
 
 void BrowserActionsContainer::StartShowFolderDropMenuTimer() {
   int delay = View::GetMenuShowDelay();
@@ skipping 438 matching lines @@
 
 void BrowserActionsContainer::BrowserActionAdded(Extension* extension,
                                                  int index) {
 #if defined(DEBUG)
   for (size_t i = 0; i < browser_action_views_.size(); ++i) {
     DCHECK(browser_action_views_[i]->button()->extension() != extension) <<
            "Asked to add a browser action view for an extension that already "
            "exists.";
   }
 #endif
-
-  CloseMenus();
+  CloseOverflowMenu();
 
   if (!ShouldDisplayBrowserAction(extension))
     return;
 
   if (profile_->IsOffTheRecord())
     index = model_->OriginalIndexToIncognito(index);
 
   // Before we change anything, determine the number of visible browser actions.
   size_t visible_actions = VisibleBrowserActions();
 
@@ skipping 18 matching lines @@
 
     // We don't want the chevron to appear while we animate. See documentation
     // in the header for why we do this.
     suppress_chevron_ = !chevron_->IsVisible();
 
     Animate(SlideAnimation::NONE, target_size);
   }
 }
 
 void BrowserActionsContainer::BrowserActionRemoved(Extension* extension) {
-  CloseMenus();
+  CloseOverflowMenu();
 
   if (popup_ && popup_->host()->extension() == extension)
     HidePopup();
 
   // Before we change anything, determine the number of visible browser
   // actions.
   size_t visible_actions = VisibleBrowserActions();
 
   for (BrowserActionViews::iterator iter =
        browser_action_views_.begin(); iter != browser_action_views_.end();
@@ skipping 135 matching lines @@
   profile_->GetPrefs()->SetInteger(prefs::kBrowserActionContainerWidth,
                                    container_size_.width());
 }
 
 void BrowserActionsContainer::NotifyMenuDeleted(
     BrowserActionOverflowMenuController* controller) {
   DCHECK(controller == overflow_menu_);
   overflow_menu_ = NULL;
 }
 
-void BrowserActionsContainer::ShowPopupForDevToolsWindow(Extension* extension,
-    ExtensionAction* extension_action) {
-  OnBrowserActionExecuted(GetBrowserActionView(extension)->button(),
+void BrowserActionsContainer::InspectPopup(
+    ExtensionAction* action) {
+  OnBrowserActionExecuted(GetBrowserActionView(action)->button(),
       true); // inspect_with_devtools
 }
 
 void BrowserActionsContainer::ExtensionPopupClosed(ExtensionPopup* popup) {
   // ExtensionPopup is ref-counted, so we don't need to delete it.
   DCHECK_EQ(popup_, popup);
   popup_ = NULL;
   popup_button_->SetButtonNotPushed();
   popup_button_ = NULL;
 }
 
 bool BrowserActionsContainer::ShouldDisplayBrowserAction(Extension* extension) {
   // Only display incognito-enabled extensions while in incognito mode.
   return (!profile_->IsOffTheRecord() ||
           profile_->GetExtensionsService()->IsIncognitoEnabled(extension));
 }