Add ContextMenuSourceType to views::ContextMenuController::ShowContextMenuForView.

chrome/browser/ui/views/bookmarks/bookmark_bar_view.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_bar_view.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 #include <vector>
@@ skipping 890 matching lines @@
     index = parent_node->child_count();
   } else {
     parent_node = root;
   }
   const BookmarkNodeData data = drop_info_->data;
   DCHECK(data.is_valid());
   drop_info_.reset();
   return chrome::DropBookmarks(browser_->profile(), data, parent_node, index);
 }
 
-void BookmarkBarView::ShowContextMenu(const gfx::Point& p,
-                                      bool is_mouse_gesture) {
-  ShowContextMenuForView(this, p);
-}
-
 void BookmarkBarView::OnThemeChanged() {
   UpdateColors();
 }
 
 const char* BookmarkBarView::GetClassName() const {
   return kViewClassName;
 }
 
 void BookmarkBarView::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_TOOLBAR;
@@ skipping 280 matching lines @@
         content::PAGE_TRANSITION_AUTO_BOOKMARK, false);
     page_navigator_->OpenURL(params);
   } else {
     chrome::OpenAll(GetWidget()->GetNativeWindow(), page_navigator_, node,
                     disposition_from_event_flags, browser_->profile());
   }
 
   bookmark_utils::RecordBookmarkLaunch(GetBookmarkLaunchLocation());
 }
 
-void BookmarkBarView::ShowContextMenuForView(views::View* source,
-                                             const gfx::Point& point) {
+void BookmarkBarView::ShowContextMenuForView(
+    views::View* source,
+    const gfx::Point& point,
+    ui::ContextMenuSourceType source_type) {
   if (!model_->loaded()) {
     // Don't do anything if the model isn't loaded.
     return;
   }
 
   const BookmarkNode* parent = NULL;
   std::vector<const BookmarkNode*> nodes;
   if (source == other_bookmarked_button_) {
     parent = model_->other_node();
     // Do this so the user can open all bookmarks. BookmarkContextMenu makes
@@ skipping 15 matching lines @@
     nodes.push_back(parent);
   }
   Profile* profile = browser_->profile();
   bool close_on_remove =
       (parent == BookmarkModelFactory::GetForProfile(profile)->other_node()) &&
       (parent->child_count() == 1);
   context_menu_.reset(new BookmarkContextMenu(
       GetWidget(), browser_, profile,
       browser_->tab_strip_model()->GetActiveWebContents(),
       parent, nodes, close_on_remove));
-  context_menu_->RunMenuAt(point);
+  context_menu_->RunMenuAt(point, source_type);
 }
 
 void BookmarkBarView::Init() {
   // Note that at this point we're not in a hierarchy so GetThemeProvider() will
   // return NULL.  When we're inserted into a hierarchy, we'll call
   // UpdateColors(), which will set the appropriate colors for all the objects
   // added in this function.
 
   // Child views are traversed in the order they are added. Make sure the order
   // they are added matches the visual order.
@@ skipping 598 matching lines @@
   DCHECK(apps_page_shortcut_);
   // Only perform layout if required.
   bool visible = chrome::ShouldShowAppsShortcutInBookmarkBar(
       browser_->profile());
   if (apps_page_shortcut_->visible() == visible)
     return;
   apps_page_shortcut_->SetVisible(visible);
   UpdateBookmarksSeparatorVisibility();
   Layout();
 }