MacViews: Run native Cocoa context menus to support Services.

chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.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/bookmarks/bookmark_menu_controller_views.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_stats.h"
@@ skipping 15 matching lines @@
 #include "ui/views/widget/widget.h"
 
 using base::UserMetricsAction;
 using content::PageNavigator;
 using views::MenuItemView;
 
 BookmarkMenuController::BookmarkMenuController(Browser* browser,
                                                PageNavigator* page_navigator,
                                                views::Widget* parent,
                                                const BookmarkNode* node,
-                                               int start_child_index)
+                                               int start_child_index,
+                                               bool for_drop)
     : menu_delegate_(
         new BookmarkMenuDelegate(browser, page_navigator, parent, 1,
                                  kint32max)),
       node_(node),
       observer_(NULL),
-      for_drop_(false),
+      for_drop_(for_drop),
       bookmark_bar_(NULL) {
   menu_delegate_->Init(this, NULL, node, start_child_index,
                        BookmarkMenuDelegate::HIDE_PERMANENT_FOLDERS,
                        BOOKMARK_LAUNCH_LOCATION_BAR_SUBFOLDER);
-  menu_runner_.reset(new views::MenuRunner(menu_delegate_->menu()));
+  menu_runner_.reset(new views::MenuRunner(
+      menu_delegate_->menu(), for_drop ? views::MenuRunner::FOR_DROP : 0));
 }
 
-void BookmarkMenuController::RunMenuAt(BookmarkBarView* bookmark_bar,
-                                       bool for_drop) {
+void BookmarkMenuController::RunMenuAt(BookmarkBarView* bookmark_bar) {
   bookmark_bar_ = bookmark_bar;
   views::MenuButton* menu_button = bookmark_bar_->GetMenuButtonForNode(node_);
   DCHECK(menu_button);
   views::MenuAnchorPosition anchor;
   bookmark_bar_->GetAnchorPositionForButton(menu_button, &anchor);
   gfx::Point screen_loc;
   views::View::ConvertPointToScreen(menu_button, &screen_loc);
   // Subtract 1 from the height to make the popup flush with the button border.
   gfx::Rect bounds(screen_loc.x(), screen_loc.y(), menu_button->width(),
                    menu_button->height() - 1);
-  for_drop_ = for_drop;
   menu_delegate_->GetBookmarkModel()->AddObserver(this);
   // We only delete ourself after the menu completes, so we can safely ignore
   // the return value.
-  ignore_result(menu_runner_->RunMenuAt(menu_delegate_->parent(), menu_button,
-      bounds, anchor, ui::MENU_SOURCE_NONE,
-      for_drop ? views::MenuRunner::FOR_DROP : 0));
-  if (!for_drop)
+  ignore_result(menu_runner_->RunMenuAt(menu_delegate_->parent(),
+                                        menu_button,
+                                        bounds,
+                                        anchor,
+                                        ui::MENU_SOURCE_NONE));
+  if (!for_drop_)
     delete this;
 }
 
 void BookmarkMenuController::Cancel() {
   menu_delegate_->menu()->Cancel();
 }
 
 MenuItemView* BookmarkMenuController::menu() const {
   return menu_delegate_->menu();
 }
@@ skipping 111 matching lines @@
 void BookmarkMenuController::BookmarkModelChanged() {
   if (!menu_delegate_->is_mutating_model())
     menu()->Cancel();
 }
 
 BookmarkMenuController::~BookmarkMenuController() {
   menu_delegate_->GetBookmarkModel()->RemoveObserver(this);
   if (observer_)
     observer_->BookmarkMenuControllerDeleted(this);
 }