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

Unified Diff: ui/views/controls/combobox/combobox.cc

Issue 393943006: MacViews: Remove GetMenu() from MenuRunner. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 520dd945fbc130b9d475c18ce4cc8646f9bf69bd..4943113a40247262b3720f026bdccba535bfe65a 100644
--- a/ui/views/controls/combobox/combobox.cc
+++ b/ui/views/controls/combobox/combobox.cc
@@ -589,9 +589,9 @@ void Combobox::ButtonPressed(Button* sender, const ui::Event& event) {
void Combobox::UpdateFromModel() {
const gfx::FontList& font_list = Combobox::GetFontList();
- MenuItemView* menu = new MenuItemView(this);
- // MenuRunner owns |menu|.
- dropdown_list_menu_runner_.reset(new MenuRunner(menu, MenuRunner::COMBOBOX));
+ menu_ = new MenuItemView(this);
+ // MenuRunner owns |menu_|.
+ dropdown_list_menu_runner_.reset(new MenuRunner(menu_, MenuRunner::COMBOBOX));
int num_items = model()->GetItemCount();
int width = 0;
@@ -602,7 +602,7 @@ void Combobox::UpdateFromModel() {
// always selected and rendered on the top of the action button.
if (model()->IsItemSeparatorAt(i)) {
if (text_item_appended || style_ != STYLE_ACTION)
- menu->AppendSeparator();
+ menu_->AppendSeparator();
continue;
}
@@ -613,7 +613,7 @@ void Combobox::UpdateFromModel() {
base::i18n::AdjustStringForLocaleDirection(&text);
if (style_ != STYLE_ACTION || i > 0) {
- menu->AppendMenuItem(i + kFirstMenuItemId, text, MenuItemView::NORMAL);
+ menu_->AppendMenuItem(i + kFirstMenuItemId, text, MenuItemView::NORMAL);
text_item_appended = true;
}
@@ -752,8 +752,7 @@ void Combobox::ShowDropDownMenu(ui::MenuSourceType source_type) {
UpdateFromModel();
// Extend the menu to the width of the combobox.
- MenuItemView* menu = dropdown_list_menu_runner_->GetMenu();
- SubmenuView* submenu = menu->CreateSubmenu();
+ SubmenuView* submenu = menu_->CreateSubmenu();
submenu->set_minimum_preferred_width(
size().width() - (kMenuBorderWidthLeft + kMenuBorderWidthRight));

Powered by Google App Engine
This is Rietveld 408576698