Moves ownership of MenuItemView to MenuRunner as well as responbility

chrome/browser/chromeos/login/language_switch_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/login/language_switch_menu.h"
 
 #include "base/i18n/rtl.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chrome/browser/chromeos/login/language_list.h"
 #include "chrome/browser/chromeos/login/ownership_service.h"
 #include "chrome/browser/chromeos/login/screen_observer.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/pref_names.h"
 #include "grit/generated_resources.h"
 #include "grit/platform_locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/platform_font_gtk.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/menu_item_view.h"
+#include "views/controls/menu/menu_runner.h"
 #include "views/controls/menu/submenu_view.h"
 #include "views/widget/widget.h"
 
 namespace {
 
 const int kLanguageMainMenuSize = 5;
 // TODO(glotov): need to specify the list as a part of the image customization.
 const char kLanguagesTopped[] = "es,it,de,fr,en-US";
 const int kMoreLanguagesSubMenu = 200;
 
 }  // namespace
 
 namespace chromeos {
 
 LanguageSwitchMenu::LanguageSwitchMenu()
-    : ALLOW_THIS_IN_INITIALIZER_LIST(menu_(new views::MenuItemView(this))) {
+    : ALLOW_THIS_IN_INITIALIZER_LIST(menu_(new views::MenuItemView(this))),
+      menu_runner_(new views::MenuRunner(menu_)) {
 }
 
 LanguageSwitchMenu::~LanguageSwitchMenu() {}
 
 void LanguageSwitchMenu::InitLanguageMenu() {
   // Update LanguageList to contain entries in current locale.
   language_list_.reset(new LanguageList);
   language_list_->CopySpecifiedLanguagesUp(kLanguagesTopped);
 
   // Clear older menu items.
@@ skipping 112 matching lines @@
   // We align on the left edge of the button for non RTL case.
   // MenuButton passes in pt the lower left corner for RTL and the
   // lower right corner for non-RTL (with menu_offset applied).
   const int reverse_offset = button->width() + button->menu_offset().x() * 2;
   gfx::Point new_pt(pt);
   if (base::i18n::IsRTL())
     new_pt.set_x(pt.x() + reverse_offset);
   else
     new_pt.set_x(pt.x() - reverse_offset);
 
-  menu_->RunMenuAt(button->GetWidget(), button,
-      gfx::Rect(new_pt, gfx::Size()), views::MenuItemView::TOPLEFT, true);
+  if (menu_runner_->RunMenuAt(button->GetWidget(), button,
+          gfx::Rect(new_pt, gfx::Size()), views::MenuItemView::TOPLEFT,
+          views::MenuRunner::HAS_MNEMONICS) == views::MenuRunner::MENU_DELETED)
+    return;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // views::MenuDelegate implementation.
 
 void LanguageSwitchMenu::ExecuteCommand(int command_id) {
   const std::string locale = language_list_->GetLocaleFromIndex(command_id);
   // Here, we should enable keyboard layouts associated with the locale so
   // that users can use those keyboard layouts on the login screen.
   SwitchLanguageAndEnableKeyboardLayouts(locale);
   g_browser_process->local_state()->SetString(
       prefs::kApplicationLocale, locale);
   g_browser_process->local_state()->ScheduleSavePersistentPrefs();
   InitLanguageMenu();
 
   // Update all view hierarchies that the locale has changed.
   views::Widget::NotifyLocaleChanged();
 }
 
 }  // namespace chromeos