Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(718)

Unified Diff: chrome/browser/ui/views/toolbar/browser_actions_container.cc

Issue 331993009: MacViews: Run native Cocoa context menus to support Services. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add VIEWS_EXPORT for unit test access Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/toolbar/browser_actions_container.cc
diff --git a/chrome/browser/ui/views/toolbar/browser_actions_container.cc b/chrome/browser/ui/views/toolbar/browser_actions_container.cc
index d935524540f9a19c9e4c5bbd65a5084b5f4304ed..f6c8d94dd657f2b522ef127d2614cf018191ddee 100644
--- a/chrome/browser/ui/views/toolbar/browser_actions_container.cc
+++ b/chrome/browser/ui/views/toolbar/browser_actions_container.cc
@@ -518,11 +518,15 @@ void BrowserActionsContainer::GetAccessibleState(
void BrowserActionsContainer::OnMenuButtonClicked(views::View* source,
const gfx::Point& point) {
if (source == chevron_) {
- overflow_menu_ = new BrowserActionOverflowMenuController(
- this, browser_, chevron_, browser_action_views_,
- VisibleBrowserActions());
+ overflow_menu_ =
+ new BrowserActionOverflowMenuController(this,
+ browser_,
+ chevron_,
+ browser_action_views_,
+ VisibleBrowserActions(),
+ false);
overflow_menu_->set_observer(this);
- overflow_menu_->RunMenu(GetWidget(), false);
+ overflow_menu_->RunMenu(GetWidget());
}
}
@@ -940,10 +944,15 @@ void BrowserActionsContainer::StartShowFolderDropMenuTimer() {
void BrowserActionsContainer::ShowDropFolder() {
DCHECK(!overflow_menu_);
SetDropIndicator(-1);
- overflow_menu_ = new BrowserActionOverflowMenuController(
- this, browser_, chevron_, browser_action_views_, VisibleBrowserActions());
+ overflow_menu_ =
+ new BrowserActionOverflowMenuController(this,
+ browser_,
+ chevron_,
+ browser_action_views_,
+ VisibleBrowserActions(),
+ true);
overflow_menu_->set_observer(this);
- overflow_menu_->RunMenu(GetWidget(), true);
+ overflow_menu_->RunMenu(GetWidget());
}
void BrowserActionsContainer::SetDropIndicator(int x_pos) {

Powered by Google App Engine
This is Rietveld 408576698