MacViews: Run native Cocoa context menus to support Services.

chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.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/extensions/browser_action_overflow_menu_controller.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
@@ skipping 45 matching lines @@
   BrowserActionButton* button_;
 
   DISALLOW_COPY_AND_ASSIGN(IconUpdater);
 };
 
 BrowserActionOverflowMenuController::BrowserActionOverflowMenuController(
     BrowserActionsContainer* owner,
     Browser* browser,
     views::MenuButton* menu_button,
     const std::vector<BrowserActionView*>& views,
-    int start_index)
+    int start_index,
+    bool for_drop)
     : owner_(owner),
       browser_(browser),
       observer_(NULL),
       menu_button_(menu_button),
       menu_(NULL),
       views_(&views),
       start_index_(start_index),
-      for_drop_(false) {
+      for_drop_(for_drop) {
   menu_ = new views::MenuItemView(this);
-  menu_runner_.reset(new views::MenuRunner(menu_));
+  menu_runner_.reset(new views::MenuRunner(
+      menu_, for_drop_ ? views::MenuRunner::FOR_DROP : 0));
   menu_->set_has_icons(true);
 
   size_t command_id = 1;  // Menu id 0 is reserved, start with 1.
   for (size_t i = start_index; i < views_->size(); ++i) {
     BrowserActionView* view = (*views_)[i];
     views::MenuItemView* menu_item = menu_->AppendMenuItemWithIcon(
         command_id,
         base::UTF8ToUTF16(view->button()->extension()->name()),
         view->GetIconWithBadge());
 
     // Set the tooltip for this item.
     base::string16 tooltip = base::UTF8ToUTF16(
         extensions::ExtensionActionManager::Get(owner_->profile())->
         GetBrowserAction(*view->button()->extension())->
         GetTitle(owner_->GetCurrentTabId()));
     menu_->SetTooltip(tooltip, command_id);
 
     icon_updaters_.push_back(new IconUpdater(menu_item, view->button()));
 
     ++command_id;
   }
 }
 
 BrowserActionOverflowMenuController::~BrowserActionOverflowMenuController() {
   if (observer_)
     observer_->NotifyMenuDeleted(this);
 }
 
-bool BrowserActionOverflowMenuController::RunMenu(views::Widget* window,
-                                                  bool for_drop) {
-  for_drop_ = for_drop;
-
+bool BrowserActionOverflowMenuController::RunMenu(views::Widget* window) {
   gfx::Rect bounds = menu_button_->bounds();
   gfx::Point screen_loc;
   views::View::ConvertPointToScreen(menu_button_, &screen_loc);
   bounds.set_x(screen_loc.x());
   bounds.set_y(screen_loc.y());
 
   views::MenuAnchorPosition anchor = views::MENU_ANCHOR_TOPRIGHT;
   // As we maintain our own lifetime we can safely ignore the result.
-  ignore_result(menu_runner_->RunMenuAt(window, menu_button_, bounds, anchor,
-      ui::MENU_SOURCE_NONE, for_drop_ ? views::MenuRunner::FOR_DROP : 0));
+  ignore_result(menu_runner_->RunMenuAt(
+      window, menu_button_, bounds, anchor, ui::MENU_SOURCE_NONE));
   if (!for_drop_) {
     // Give the context menu (if any) a chance to execute the user-selected
     // command.
     base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
   }
   return true;
 }
 
 void BrowserActionOverflowMenuController::CancelMenu() {
   menu_->Cancel();
@@ skipping 14 matching lines @@
     int id,
     const gfx::Point& p,
     ui::MenuSourceType source_type) {
   const extensions::Extension* extension =
       (*views_)[start_index_ + id - 1]->button()->extension();
   if (!extension->ShowConfigureContextMenus())
     return false;
 
   scoped_refptr<ExtensionContextMenuModel> context_menu_contents =
       new ExtensionContextMenuModel(extension, browser_, owner_);
-  views::MenuRunner context_menu_runner(context_menu_contents.get());
+  views::MenuRunner context_menu_runner(context_menu_contents.get(),
+                                        views::MenuRunner::HAS_MNEMONICS |
+                                            views::MenuRunner::IS_NESTED |
+                                            views::MenuRunner::CONTEXT_MENU);
 
   // We can ignore the result as we delete ourself.
   // This blocks until the user choses something or dismisses the menu.
-  ignore_result(context_menu_runner.RunMenuAt(
-      menu_button_->GetWidget(),
-      NULL,
-      gfx::Rect(p, gfx::Size()),
-      views::MENU_ANCHOR_TOPLEFT,
-      source_type,
-      views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::IS_NESTED |
-          views::MenuRunner::CONTEXT_MENU));
+  ignore_result(context_menu_runner.RunMenuAt(menu_button_->GetWidget(),
+                                              NULL,
+                                              gfx::Rect(p, gfx::Size()),
+                                              views::MENU_ANCHOR_TOPLEFT,
+                                              source_type));
 
   // The user is done with the context menu, so we can close the underlying
   // menu.
   menu_->Cancel();
 
   return true;
 }
 
 void BrowserActionOverflowMenuController::DropMenuClosed(
     views::MenuItemView* menu) {
@@ skipping 86 matching lines @@
 
 BrowserActionView* BrowserActionOverflowMenuController::ViewForId(
     int id, size_t* index) {
   // The index of the view being dragged (GetCommand gives a 1-based index into
   // the overflow menu).
   size_t view_index = owner_->VisibleBrowserActions() + id - 1;
   if (index)
     *index = view_index;
   return owner_->GetBrowserActionViewAt(view_index);
 }