Convert BrowserActionsContainer context menu from Menu2 to MenuItemView.

chrome/browser/ui/views/browser_actions_container.cc

 // Copyright (c) 2011 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/browser_actions_container.h"
 
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
@@ skipping 24 matching lines @@
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/button/text_button.h"
-#include "views/controls/menu/menu_2.h"
+#include "views/controls/menu/menu_item_view.h"
+#include "views/controls/menu/menu_model_adapter.h"
 #include "views/drag_utils.h"
 #include "views/metrics.h"
 #include "views/window/window.h"
 
 // Horizontal spacing between most items in the container, as well as after the
 // last item or chevron (if visible).
 static const int kItemSpacing = ToolbarView::kStandardSpacing;
 // Horizontal spacing before the chevron (if visible).
 static const int kChevronSpacing = kItemSpacing - 2;
 
 // static
 bool BrowserActionsContainer::disable_animations_during_testing_ = false;
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserActionButton
 
 BrowserActionButton::BrowserActionButton(const Extension* extension,
                                          BrowserActionsContainer* panel)
     : ALLOW_THIS_IN_INITIALIZER_LIST(
           MenuButton(this, std::wstring(), NULL, false)),
       browser_action_(extension->browser_action()),
       extension_(extension),
       ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this)),
-      showing_context_menu_(false),
-      panel_(panel) {
+      panel_(panel),
+      context_menu_(NULL) {
   set_border(NULL);
   set_alignment(TextButton::ALIGN_CENTER);
 
   // No UpdateState() here because View hierarchy not setup yet. Our parent
   // should call UpdateState() after creation.
 
   registrar_.Add(this, NotificationType::EXTENSION_BROWSER_ACTION_UPDATED,
                  Source<ExtensionAction>(browser_action_));
 }
 
 void BrowserActionButton::Destroy() {
-  if (showing_context_menu_) {
-    context_menu_menu_->CancelMenu();
+  if (context_menu_) {
+    context_menu_->Cancel();
     MessageLoop::current()->DeleteSoon(FROM_HERE, this);
   } else {
     delete this;
   }
 }
 
 void BrowserActionButton::ViewHierarchyChanged(
     bool is_add, View* parent, View* child) {
   if (is_add && child == this) {
     // The Browser Action API does not allow the default icon path to be
@@ skipping 114 matching lines @@
   // to us.
   return false;
 }
 
 bool BrowserActionButton::OnMousePressed(const views::MouseEvent& event) {
   if (!event.IsRightMouseButton()) {
     return IsPopup() ?
         MenuButton::OnMousePressed(event) : TextButton::OnMousePressed(event);
   }
 
-  // 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());
-
-  ShowContextMenu(point, true);
+  ShowContextMenu(gfx::Point(), true);
   return false;
 }
 
 void BrowserActionButton::OnMouseReleased(const views::MouseEvent& event) {
-  if (IsPopup() || showing_context_menu_) {
+  if (IsPopup() || context_menu_) {
     // TODO(erikkay) this never actually gets called (probably because of the
     // loss of focus).
     MenuButton::OnMouseReleased(event);
   } else {
     TextButton::OnMouseReleased(event);
   }
 }
 
 void BrowserActionButton::OnMouseExited(const views::MouseEvent& event) {
-  if (IsPopup() || showing_context_menu_)
+  if (IsPopup() || context_menu_)
     MenuButton::OnMouseExited(event);
   else
     TextButton::OnMouseExited(event);
 }
 
 bool BrowserActionButton::OnKeyReleased(const views::KeyEvent& event) {
   return IsPopup() ?
       MenuButton::OnKeyReleased(event) : TextButton::OnKeyReleased(event);
 }
 
 void BrowserActionButton::ShowContextMenu(const gfx::Point& p,
                                           bool is_mouse_gesture) {
   if (!extension()->ShowConfigureContextMenus())
     return;
 
-  showing_context_menu_ = true;
   SetButtonPushed();
 
   // Reconstructs the menu every time because the menu's contents are dynamic.
   context_menu_contents_ =

[Peter Kasting, 2011/06/09 17:43:57]

It looks like this leaks.  Should this be a scoped_refptr?

[rhashimoto, 2011/06/09 18:19:01]

It is a scoped_refptr.  I thought I would change the operator= to a reset() to
make that clear, but apparently it has no reset() method.

[Peter Kasting, 2011/06/09 18:20:42]

Oh, it's a member.  Why is it a member?  Seems like it should be a local.

[rhashimoto, 2011/06/09 18:27:51]

Done.

       new ExtensionContextMenuModel(extension(), panel_->browser(), panel_);
-  context_menu_menu_.reset(new views::Menu2(context_menu_contents_.get()));
-  context_menu_menu_->RunContextMenuAt(p);
+  views::MenuModelAdapter menu_model_adapter(context_menu_contents_.get());
+  context_menu_ = new views::MenuItemView(&menu_model_adapter);

[Peter Kasting, 2011/06/09 17:43:57]

What about that idea of stack-allocating this object?

[rhashimoto, 2011/06/09 18:19:01]

Done.

+  menu_model_adapter.BuildMenu(context_menu_);
+
+  gfx::Point screen_loc;
+  views::View::ConvertPointToScreen(this, &screen_loc);
+  context_menu_->RunMenuAt(GetWidget()->GetNativeWindow(), NULL,
+      gfx::Rect(screen_loc, size()), views::MenuItemView::TOPLEFT, true);
 
   SetButtonNotPushed();
-  showing_context_menu_ = false;
+  delete context_menu_;
+  context_menu_ = NULL;
 }
 
 void BrowserActionButton::SetButtonPushed() {
   SetState(views::CustomButton::BS_PUSHED);
   menu_visible_ = true;
 }
 
 void BrowserActionButton::SetButtonNotPushed() {
   SetState(views::CustomButton::BS_NORMAL);
   menu_visible_ = false;
@@ skipping 818 matching lines @@
   }
 }
 
 bool BrowserActionsContainer::ShouldDisplayBrowserAction(
     const Extension* extension) {
   // Only display incognito-enabled extensions while in incognito mode.
   return
       (!profile_->IsOffTheRecord() ||
        profile_->GetExtensionService()->IsIncognitoEnabled(extension->id()));
 }