Moves ownership of MenuItemView to MenuRunner as well as responbility

views/controls/combobox/native_combobox_views.cc

 // Copyright (c) 2011 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 "views/controls/combobox/native_combobox_views.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/path.h"
 #include "views/background.h"
 #include "views/border.h"
 #include "views/controls/combobox/combobox.h"
 #include "views/controls/focusable_border.h"
+#include "views/controls/menu/menu_runner.h"
 #include "views/controls/menu/submenu_view.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 
 #if defined(OS_LINUX)
 #include "ui/gfx/gtk_util.h"
 #endif
 
 namespace {
 
@@ skipping 125 matching lines @@
   NOTREACHED();
 }
 
 /////////////////////////////////////////////////////////////////
 // NativeComboboxViews, NativeComboboxWrapper overrides:
 
 void NativeComboboxViews::UpdateFromModel() {
   int max_width = 0;
   const gfx::Font &font = GetFont();
 
-  dropdown_list_menu_.reset(new MenuItemView(this));
+  MenuItemView* menu = new MenuItemView(this);
+  // MenuRunner owns |menu|.
+  dropdown_list_menu_runner_.reset(new MenuRunner(menu));
 
   int num_items = combobox_->model()->GetItemCount();
   for (int i = 0; i < num_items; ++i) {
     string16 text = combobox_->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);
 
-    dropdown_list_menu_->AppendMenuItem(i + kFirstMenuItemId, UTF16ToWide(text),
-         MenuItemView::NORMAL);
-     max_width = std::max(max_width, font.GetStringWidth(text));
-   }
+    menu->AppendMenuItem(i + kFirstMenuItemId, UTF16ToWide(text),
+                         MenuItemView::NORMAL);
+    max_width = std::max(max_width, font.GetStringWidth(text));
+  }
 
   content_width_ = max_width;
   content_height_ = font.GetFontSize();
 }
 
 void NativeComboboxViews::UpdateSelectedItem() {
   selected_item_ = combobox_->selected_item();
 }
 
 void NativeComboboxViews::UpdateEnabled() {
@@ skipping 145 matching lines @@
       lb.width() - kComboboxArrowSize - kComboboxArrowMargin,
       kTopInsetSize,
       lb.width() - kComboboxArrowSize - kComboboxArrowMargin,
       lb.height() - kBottomInsetSize);
 
   canvas->Restore();
 }
 
 void NativeComboboxViews::ShowDropDownMenu() {
 
-  if (!dropdown_list_menu_.get())
+  if (!dropdown_list_menu_runner_.get())
     UpdateFromModel();
 
   // Extend the menu to the width of the combobox.
-  SubmenuView* submenu = dropdown_list_menu_->CreateSubmenu();
+  SubmenuView* submenu = dropdown_list_menu_runner_->GetMenu()->CreateSubmenu();
   submenu->set_minimum_preferred_width(size().width());
 
   gfx::Rect lb = GetLocalBounds();
   gfx::Point menu_position(lb.origin());
   View::ConvertPointToScreen(this, &menu_position);
   if (menu_position.x() < 0)
       menu_position.set_x(0);
 
   gfx::Rect bounds(menu_position, lb.size());
 
   dropdown_open_ = true;
-  dropdown_list_menu_->RunMenuAt(NULL, NULL, bounds, MenuItemView::TOPLEFT,
-                                 true);
+  if (dropdown_list_menu_runner_->RunMenuAt(
+          NULL, NULL, bounds, MenuItemView::TOPLEFT,
+          MenuRunner::HAS_MNEMONICS) == MenuRunner::MENU_DELETED)
+    return;
   dropdown_open_ = false;
 
   // Need to explicitly clear mouse handler so that events get sent
   // properly after the menu finishes running. If we don't do this, then
   // the first click to other parts of the UI is eaten.
   SetMouseHandler(NULL);
 }
 
 }  // namespace views