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

chrome/browser/chromeos/status/input_method_menu.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_STATUS_INPUT_METHOD_MENU_H_
 #define CHROME_BROWSER_CHROMEOS_STATUS_INPUT_METHOD_MENU_H_
 #pragma once
 
 #include <string>
 
 #include "chrome/browser/chromeos/cros/input_method_library.h"
 #include "chrome/browser/chromeos/status/status_area_host.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/notification_type.h"
-#include "ui/base/models/simple_menu_model.h"
-#include "views/controls/menu/menu_2.h"
+#include "ui/base/models/menu_model.h"
+#include "views/controls/menu/menu_item_view.h"
 #include "views/controls/menu/view_menu_delegate.h"
 
 class PrefService;
 class SkBitmap;
 
+namespace ui {
+class SimpleMenuModel;
+}  // namespace ui
+
+namespace views {
+class MenuModelAdapter;
+}  // namespace views
+
 namespace chromeos {
 
 // A class for the dropdown menu for switching input method and keyboard layout.
 // Since the class provides the views::ViewMenuDelegate interface, it's easy to
 // create a button widget (e.g. views::MenuButton, chromeos::StatusAreaButton)
 // which shows the dropdown menu on click.
 class InputMethodMenu : public views::ViewMenuDelegate,
                         public ui::MenuModel,
                         public InputMethodLibrary::Observer,
                         public NotificationObserver {
@@ skipping 18 matching lines @@
   virtual ui::ButtonMenuItemModel* GetButtonMenuItemAt(int index) const;
   virtual bool IsEnabledAt(int index) const;
   virtual ui::MenuModel* GetSubmenuModelAt(int index) const;
   virtual void HighlightChangedTo(int index);
   virtual void ActivatedAt(int index);
   virtual void MenuWillShow();
   virtual void SetMenuModelDelegate(ui::MenuModelDelegate* delegate);
 
   // views::ViewMenuDelegate implementation. Sub classes can override the method
   // to adjust the position of the menu.
-  virtual void RunMenu(views::View* unused_source,
-                       const gfx::Point& pt);
+  virtual void RunMenu(views::View* source, const gfx::Point& pt);
 
   // InputMethodLibrary::Observer implementation.
   virtual void InputMethodChanged(
       InputMethodLibrary* obj,
       const InputMethodDescriptor& current_input_method,
       size_t num_active_input_methods);
   virtual void ActiveInputMethodsChanged(
       InputMethodLibrary* obj,
       const InputMethodDescriptor& current_input_method,
       size_t num_active_input_methods);
   virtual void PreferenceUpdateNeeded(
     InputMethodLibrary* obj,
     const InputMethodDescriptor& previous_input_method,
     const InputMethodDescriptor& current_input_method);
   virtual void PropertyListChanged(
       InputMethodLibrary* obj,
       const ImePropertyList& current_ime_properties);
   virtual void FirstObserverIsAdded(InputMethodLibrary* obj);
 
   // NotificationObserver implementation.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
+  // Specify menu alignment (default TOPRIGHT).
+  void set_menu_alignment(views::MenuItemView::AnchorPosition menu_alignment) {
+    menu_alignment_ = menu_alignment;
+  }
+
   // Sets the minimum width of the dropdown menu.
   void SetMinimumWidth(int width);
 
-  // Rebuilds model and menu2 objects.
-  void PrepareMenu();
+  // Rebuilds menu model.
+  void PrepareMenuModel();
 
   // Registers input method preferences for the login screen.
   static void RegisterPrefs(PrefService* local_state);
 
   // Returns a string for the indicator on top right corner of the Chrome
   // window. The method is public for unit tests.
   static std::wstring GetTextForIndicator(
       const InputMethodDescriptor& input_method);
 
   // Returns a string for the drop-down menu and the tooltip for the indicator.
   // The method is public for unit tests.
   static std::wstring GetTextForMenu(const InputMethodDescriptor& input_method);
 
  protected:
   // Prepares menu: saves user metrics and rebuilds.
   void PrepareForMenuOpen();
 
-  // Returns menu2 object for language menu.
-  views::Menu2& input_method_menu() {
-    return input_method_menu_;
-  }
-
  private:
   // Updates UI of a container of the menu (e.g. the "US" menu button in the
   // status area). Sub classes have to implement the interface for their own UI.
   virtual void UpdateUI(const std::string& input_method_id,  // e.g. "mozc"
                         const std::wstring& name,  // e.g. "US", "INTL"
                         const std::wstring& tooltip,
                         size_t num_active_input_methods) = 0;
 
   // Sub classes have to implement the interface. This interface should return
   // true if the dropdown menu should show an item like "Customize languages
@@ skipping 27 matching lines @@
 
   // The current input method list.
   scoped_ptr<InputMethodDescriptors> input_method_descriptors_;
 
   // Objects for reading/writing the Chrome prefs.
   StringPrefMember previous_input_method_pref_;
   StringPrefMember current_input_method_pref_;
 
   // We borrow ui::SimpleMenuModel implementation to maintain the current
   // content of the pop-up menu. The ui::MenuModel is implemented using this
-  // |model_|.
+  // |model_|.  The MenuModelAdapter wraps the model with the
+  // views::MenuDelegate interface required for MenuItemView.
   scoped_ptr<ui::SimpleMenuModel> model_;
+  scoped_ptr<views::MenuModelAdapter> input_method_menu_delegate_;
 
-  // The language menu which pops up when the button in status area is clicked.
-  views::Menu2 input_method_menu_;
   int minimum_input_method_menu_width_;
 
+  // Menu alignment (default TOPRIGHT).
+  views::MenuItemView::AnchorPosition menu_alignment_;
+
   PrefService* pref_service_;
   NotificationRegistrar registrar_;
 
   // The mode of the host screen  (e.g. browser, screen locker, login screen.)
   const StatusAreaHost::ScreenMode screen_mode_;
   // true if the menu is for a dialog in OOBE screen. In the dialog, we don't
   // use radio buttons.
   const bool for_out_of_box_experience_dialog_;
 
   DISALLOW_COPY_AND_ASSIGN(InputMethodMenu);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_STATUS_INPUT_METHOD_MENU_H_