Convert ChromiumOS input method menu to views::MenuItemView implementation.

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/cros/cros_library.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/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/submenu_view.h"
+#include "views/window/window.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):
 //
 // ============================== (border of the popup window)
@@ skipping 85 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // InputMethodMenu
 
 InputMethodMenu::InputMethodMenu(PrefService* pref_service,
                                  StatusAreaHost::ScreenMode screen_mode,
                                  bool for_out_of_box_experience_dialog)
     : input_method_descriptors_(CrosLibrary::Get()->GetInputMethodLibrary()->
                                 GetActiveInputMethods()),
       model_(NULL),
-      // Be aware that the constructor of |input_method_menu_| calls
-      // GetItemCount() in this class. Therefore, GetItemCount() have to return
-      // 0 when |model_| is NULL.
-      ALLOW_THIS_IN_INITIALIZER_LIST(input_method_menu_(this)),
+      ALLOW_THIS_IN_INITIALIZER_LIST(input_method_menu_delegate_(
+          new views::MenuModelAdapter(this))),
       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)) {
     previous_input_method_pref_.Init(
         prefs::kLanguagePreviousInputMethod, pref_service, this);
@@ skipping 214 matching lines @@
     }
     return;
   }
 
   LOG(ERROR) << "Unexpected index: " << index;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // views::ViewMenuDelegate implementation:
 
-void InputMethodMenu::RunMenu(
-    views::View* unused_source, const gfx::Point& pt) {
+void InputMethodMenu::RunMenu(views::View* source, const gfx::Point& pt) {
   PrepareForMenuOpen();
-  input_method_menu_.RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
+
+  views::MenuItemView menu(input_method_menu_delegate_.get());
+  input_method_menu_delegate_->BuildMenu(&menu);
+  if (minimum_input_method_menu_width_ > 0) {
+    DCHECK(menu.HasSubmenu());
+    views::SubmenuView* submenu = menu.GetSubmenu();
+    submenu->set_minimum_preferred_width(minimum_input_method_menu_width_);
+  }
+
+  // TODO(rhashimoto): Remove this workaround when WebUI provides a
+  // top-level widget on the ChromeOS login screen that is a window.
+  // The current BackgroundView class for the ChromeOS login screen
+  // creates a owning Widget that has a native GtkWindow but is not a
+  // Window.  This makes it impossible to get the NativeWindow via
+  // the views API.  This workaround casts the top-level NativeWidget
+  // to a NativeWindow that we can pass to MenuItemView::RunMenuAt().
+  gfx::NativeWindow window = GTK_WINDOW(source->GetWidget()->GetNativeView());
+
+  menu.RunMenuAt(window, NULL,
+                 gfx::Rect(pt, gfx::Size(0, 0)),
+                 menu_alignment_,
+                 true);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // InputMethodLibrary::Observer implementation:
 
 void InputMethodMenu::InputMethodChanged(
     InputMethodLibrary* obj,
     const InputMethodDescriptor& current_input_method,
     size_t num_active_input_methods) {
   UpdateUIFromInputMethod(current_input_method, num_active_input_methods);
@@ skipping 61 matching lines @@
     const std::string current_input_method_id =
         current_input_method_pref_.GetValue();
     if (!current_input_method_id.empty()) {
       library->ChangeInputMethod(current_input_method_id);
     }
   }
 }
 
 void InputMethodMenu::PrepareForMenuOpen() {
   UserMetrics::RecordAction(UserMetricsAction("LanguageMenuButton_Open"));
-  PrepareMenu();
+  PrepareMenuModel();
 }
 
-void InputMethodMenu::PrepareMenu() {
+void InputMethodMenu::PrepareMenuModel() {
   input_method_descriptors_.reset(CrosLibrary::Get()->GetInputMethodLibrary()->
                                   GetActiveInputMethods());
   RebuildModel();
-  input_method_menu_.Rebuild();
-  if (minimum_input_method_menu_width_ > 0) {
-    input_method_menu_.SetMinimumWidth(minimum_input_method_menu_width_);
-  }
 }
 
 void InputMethodMenu::ActiveInputMethodsChanged(
     InputMethodLibrary* obj,
     const InputMethodDescriptor& current_input_method,
     size_t num_active_input_methods) {
   // Update the icon if active input methods are changed. See also
   // comments in UpdateUI() in input_method_menu_button.cc.
   UpdateUIFromInputMethod(current_input_method, num_active_input_methods);
 }
@@ skipping 37 matching lines @@
 
   if (ShouldSupportConfigUI()) {
     // 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 */);
   }
+
+  // Wrap new model with views::MenuDelegate interface.
+  input_method_menu_delegate_.reset(new views::MenuModelAdapter(this));
 }
 
 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 @@
     CrosLibrary::Get()->GetInputMethodLibrary()->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