MacViews: Remove GetMenu() from MenuRunner.

ui/views/controls/combobox/combobox.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 "ui/views/controls/combobox/combobox.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 214 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // Combobox, public:
 
 Combobox::Combobox(ui::ComboboxModel* model)
     : model_(model),
       style_(STYLE_NORMAL),
       listener_(NULL),
       selected_index_(model_->GetDefaultIndex()),
       invalid_(false),
+      menu_(NULL),
       dropdown_open_(false),
       text_button_(new TransparentButton(this)),
       arrow_button_(new TransparentButton(this)),
       weak_ptr_factory_(this) {
   model_->AddObserver(this);
   UpdateFromModel();
   SetFocusable(true);
   UpdateBorder();
 
   // Initialize the button images.
@@ skipping 337 matching lines @@
       source_type = ui::MENU_SOURCE_KEYBOARD;
     else if (event.IsGestureEvent() || event.IsTouchEvent())
       source_type = ui::MENU_SOURCE_TOUCH;
     ShowDropDownMenu(source_type);
   }
 }
 
 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;
   bool text_item_appended = false;
   for (int i = 0; i < num_items; ++i) {
     // When STYLE_ACTION is used, the first item and the following separators
     // are not added to the dropdown menu. It is assumed that the first item is
     // 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;
     }
 
     base::string16 text = model()->GetItemAt(i);
 
     // Inserting the Unicode formatting characters if necessary so that the
     // text is displayed correctly in right-to-left UIs.
     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;
     }
 
     if (style_ != STYLE_ACTION || i == selected_index_)
       width = std::max(width, gfx::GetStringWidth(text, font_list));
   }
 
   content_size_.SetSize(width, font_list.GetHeight());
 }
 
@@ skipping 118 matching lines @@
                      arrow_button_->x(), height());
     canvas->Restore();
   }
 }
 
 void Combobox::ShowDropDownMenu(ui::MenuSourceType source_type) {
   if (!dropdown_list_menu_runner_.get())
     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));
 
   gfx::Rect lb = GetLocalBounds();
   gfx::Point menu_position(lb.origin());
 
   if (style_ == STYLE_NORMAL) {
     // Inset the menu's requested position so the border of the menu lines up
     // with the border of the combobox.
     menu_position.set_x(menu_position.x() + kMenuBorderWidthLeft);
@@ skipping 86 matching lines @@
   const ui::NativeTheme* native_theme_for_arrow = GetNativeTheme();
 #endif
 
   ui::NativeTheme::ExtraParams ignored;
   return native_theme_for_arrow->GetPartSize(ui::NativeTheme::kComboboxArrow,
                                              ui::NativeTheme::kNormal,
                                              ignored);
 }
 
 }  // namespace views