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

Unified Diff: ui/views/controls/combobox/combobox.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: ui/views/controls/combobox/combobox.cc
diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc
index b2a456d49063ad04e826d677da03590e80add0ba..520dd945fbc130b9d475c18ce4cc8646f9bf69bd 100644
--- a/ui/views/controls/combobox/combobox.cc
+++ b/ui/views/controls/combobox/combobox.cc
@@ -591,7 +591,7 @@ void Combobox::UpdateFromModel() {
MenuItemView* menu = new MenuItemView(this);
// MenuRunner owns |menu|.
- dropdown_list_menu_runner_.reset(new MenuRunner(menu));
+ dropdown_list_menu_runner_.reset(new MenuRunner(menu, MenuRunner::COMBOBOX));
int num_items = model()->GetItemCount();
int width = 0;
@@ -782,9 +782,8 @@ void Combobox::ShowDropDownMenu(ui::MenuSourceType source_type) {
dropdown_open_ = true;
MenuAnchorPosition anchor_position =
style_ == STYLE_ACTION ? MENU_ANCHOR_TOPRIGHT : MENU_ANCHOR_TOPLEFT;
- if (dropdown_list_menu_runner_->RunMenuAt(GetWidget(), NULL, bounds,
- anchor_position, source_type,
- MenuRunner::COMBOBOX) ==
+ if (dropdown_list_menu_runner_->RunMenuAt(
+ GetWidget(), NULL, bounds, anchor_position, source_type) ==
MenuRunner::MENU_DELETED) {
return;
}

Powered by Google App Engine
This is Rietveld 408576698