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

chrome/browser/chromeos/login/keyboard_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/keyboard_switch_menu.h"
 
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
@@ skipping 22 matching lines @@
   views::Widget::NotifyLocaleChanged();
 }
 
 bool KeyboardSwitchMenu::ShouldSupportConfigUI() {
   return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // views::ViewMenuDelegate implementation.
 void KeyboardSwitchMenu::RunMenu(views::View* source, const gfx::Point& pt) {
-  PrepareForMenuOpen();
   gfx::Point new_pt(pt);
   views::MenuButton* button = static_cast<views::MenuButton*>(source);
-  // Keyboard switch menu is aligned on left by default.
+  // Keyboard switch menu is aligned on left by default.  MenuButton passes
+  // in pt the lower left corner for RTL and the lower right corner for
+  // non-RTL (with menu_offset applied).
   int reverse_offset = button->width() + button->menu_offset().x() * 2;
   if (base::i18n::IsRTL()) {
     new_pt.set_x(pt.x() + reverse_offset);
   } else {
     new_pt.set_x(pt.x() - reverse_offset);
   }
-  input_method_menu().RunMenuAt(new_pt, views::Menu2::ALIGN_TOPLEFT);
+
+  set_menu_alignment(views::MenuItemView::TOPLEFT);
+  InputMethodMenu::RunMenu(source, new_pt);
 }
 
 string16 KeyboardSwitchMenu::GetCurrentKeyboardName() const {
   const int count = GetItemCount();
   for (int i = 0; i < count; ++i) {
     if (IsItemCheckedAt(i))
       return GetLabelAt(i);
   }
   VLOG(1) << "The input method menu is not ready yet. Show the display "
           << "name of the current input method";
   InputMethodLibrary* library = CrosLibrary::Get()->GetInputMethodLibrary();
   return UTF8ToUTF16(input_method::GetInputMethodDisplayNameFromId(
       library->current_input_method().id));
 }
 
 }  // namespace chromeos