Moves ownership of MenuItemView to MenuRunner as well as responbility

chrome/browser/chromeos/status/input_method_menu.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 "chrome/browser/chromeos/status/input_method_menu.h"
 
 #include <string>
 #include <vector>
 
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/user_metrics.h"
 #include "content/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "views/controls/menu/menu_model_adapter.h"
+#include "views/controls/menu/menu_runner.h"
 #include "views/controls/menu/submenu_view.h"
 #include "views/widget/widget.h"
 
 // The language menu consists of 3 parts (in this order):
 //
 //   (1) input method names. The size of the list is always >= 1.
 //   (2) input method properties. This list might be empty.
 //   (3) "Customize language and input..." button.
 //
 // Example of the menu (Japanese):
@@ skipping 94 matching lines @@
 InputMethodMenu::InputMethodMenu(PrefService* pref_service,
                                  StatusAreaHost::ScreenMode screen_mode,
                                  bool for_out_of_box_experience_dialog)
     : input_method_descriptors_(InputMethodManager::GetInstance()->
                                 GetActiveInputMethods()),
       model_(new ui::SimpleMenuModel(NULL)),
       ALLOW_THIS_IN_INITIALIZER_LIST(input_method_menu_delegate_(
           new views::MenuModelAdapter(this))),
       input_method_menu_(
           new views::MenuItemView(input_method_menu_delegate_.get())),
+      input_method_menu_runner_(new views::MenuRunner(input_method_menu_)),
       minimum_input_method_menu_width_(0),
       menu_alignment_(views::MenuItemView::TOPRIGHT),
       pref_service_(pref_service),
       screen_mode_(screen_mode),
       for_out_of_box_experience_dialog_(for_out_of_box_experience_dialog) {
   DCHECK(input_method_descriptors_.get() &&
          !input_method_descriptors_->empty());
 
   // Sync current and previous input methods on Chrome prefs with ibus-daemon.
   if (pref_service_ && (screen_mode_ == StatusAreaHost::kBrowserMode)) {
@@ skipping 229 matching lines @@
 
   if (minimum_input_method_menu_width_ > 0) {
     DCHECK(input_method_menu_->HasSubmenu());
     views::SubmenuView* submenu = input_method_menu_->GetSubmenu();
     submenu->set_minimum_preferred_width(minimum_input_method_menu_width_);
   }
 
   gfx::Point screen_location;
   views::View::ConvertPointToScreen(source, &screen_location);
   gfx::Rect bounds(screen_location, source->size());
-  input_method_menu_->RunMenuAt(source->GetWidget()->GetTopLevelWidget(),
-                                NULL, bounds, menu_alignment_, true);
+  if (input_method_menu_runner_->RunMenuAt(
+          source->GetWidget()->GetTopLevelWidget(), NULL, bounds,
+          menu_alignment_, views::MenuRunner::HAS_MNEMONICS) ==
+      views::MenuRunner::MENU_DELETED)
+    return;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // InputMethodManager::Observer implementation:
 
 void InputMethodMenu::InputMethodChanged(
     InputMethodManager* manager,
     const input_method::InputMethodDescriptor& current_input_method,
     size_t num_active_input_methods) {
   UpdateUIFromInputMethod(current_input_method, num_active_input_methods);
@@ skipping 126 matching lines @@
     // Note: We use AddSeparator() for separators, and AddRadioItem() for all
     // other items even if an item is not actually a radio item.
     if (need_separator) {
       model_->AddSeparator();
     }
     model_->AddRadioItem(COMMAND_ID_CUSTOMIZE_LANGUAGE, dummy_label,
                          0 /* dummy */);
   }
 
   // Rebuild the menu from the model.
-  input_method_menu_delegate_->BuildMenu(input_method_menu_.get());
+  input_method_menu_delegate_->BuildMenu(input_method_menu_);
 }
 
 bool InputMethodMenu::IndexIsInInputMethodList(int index) const {
   DCHECK_GE(index, 0);
   DCHECK(model_.get());
   if (index >= model_->GetItemCount()) {
     return false;
   }
 
   return ((model_->GetTypeAt(index) == ui::MenuModel::TYPE_RADIO) &&
@@ skipping 130 matching lines @@
     InputMethodManager::GetInstance()->RemoveObserver(this);
   }
 }
 
 void InputMethodMenu::SetMinimumWidth(int width) {
   // On the OOBE network selection screen, fixed width menu would be preferable.
   minimum_input_method_menu_width_ = width;
 }
 
 }  // namespace chromeos