Add action for each button on opt-in IME menu.

ash/common/system/chromeos/ime_menu/ime_menu_tray.cc

Index: ash/common/system/chromeos/ime_menu/ime_menu_tray.cc
diff --git a/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc b/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc
index 6defd83cdc7e06b58e5413e14f2ea3480baf0199..05cd5e16b8ac596a26c4f3f387a951891fea0dac 100644
--- a/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc
+++ b/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc
@@ -4,6 +4,7 @@
 
 #include "ash/common/system/chromeos/ime_menu/ime_menu_tray.h"
 
+#include "ash/common/accessibility_delegate.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/wm_shelf_util.h"
@@ -23,15 +24,23 @@
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
+#include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/keyboard/keyboard_controller.h"
+#include "ui/keyboard/keyboard_util.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 
+using chromeos::input_method::InputMethodManager;
+
 namespace ash {
 
 namespace {
 
+// The border width between buttons.
+const int kButtonRightBorder = 1;
+
 // Returns the max height of ImeListView.
 int GetImeListViewMaxHeight() {
   const int max_items = 7;
@@ -83,10 +92,14 @@ class ImeButtonsView : public views::View,
                        public views::ButtonListener,
                        public ViewClickListener {
  public:
-  ImeButtonsView(bool show_emoji_button,
+  ImeButtonsView(ImeMenuTray* ime_menu_tray,
+                 bool show_emoji_button,
                  bool show_voice_button,
                  bool show_handwriting_button,
-                 bool show_settings_button) {
+                 bool show_settings_button)
+      : ime_menu_tray_(ime_menu_tray) {
+    DCHECK(ime_menu_tray_);
+
     SetBorder(
         views::Border::CreateSolidSidedBorder(1, 0, 0, 0, kBorderDarkColor));
 
@@ -116,20 +129,29 @@ class ImeButtonsView : public views::View,
 
   // views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override {
-    if (emoji_button_ && sender == emoji_button_) {
-      // TODO(azurewei): Opens emoji palette.
-    } else if (voice_button_ && sender == voice_button_) {
-      // TODO(azurewei): Brings virtual keyboard for emoji input.
-    } else if (handwriting_button_ && sender == handwriting_button_) {
-      // TODO(azurewei): Brings virtual keyboard for handwriting input.
-    } else if (settings_button_ && sender == settings_button_) {
+    if (sender == settings_button_) {
+      ime_menu_tray_->HideImeMenuBubble();
       ShowIMESettings();
+      return;
     }
+
+    std::string keyset;
+    if (sender == emoji_button_)
+      keyset = "emoji";
+    else if (sender == voice_button_)
+      keyset = "voice";
+    else if (sender == handwriting_button_)
+      keyset = "handwriting";
+    else
+      NOTREACHED();
+
+    ime_menu_tray_->ShowKeyboardWithKeyset(keyset);
   }
 
   // ViewClickListener:
   void OnViewClicked(views::View* sender) override {
     if (one_settings_button_view_ && sender == one_settings_button_view_) {
+      ime_menu_tray_->HideImeMenuBubble();
       ShowIMESettings();
     }
   }
@@ -164,14 +186,32 @@ class ImeButtonsView : public views::View,
 
     if (show_emoji_button) {
       // TODO(azurewei): Creates the proper button with icons.
+      emoji_button_ = CreateImeMenuButton(
+          this, IDR_AURA_UBER_TRAY_SETTINGS, IDR_AURA_UBER_TRAY_SETTINGS,
+          IDR_AURA_UBER_TRAY_SETTINGS, IDR_AURA_UBER_TRAY_SETTINGS,
+          IDS_ASH_STATUS_TRAY_SETTINGS, IDS_ASH_STATUS_TRAY_SETTINGS,
+          kButtonRightBorder);
+      AddChildView(emoji_button_);
     }
 
     if (show_voice_button) {
       // TODO(azurewei): Creates the proper button with icons.
+      voice_button_ = CreateImeMenuButton(
+          this, IDR_AURA_UBER_TRAY_SETTINGS, IDR_AURA_UBER_TRAY_SETTINGS,
+          IDR_AURA_UBER_TRAY_SETTINGS, IDR_AURA_UBER_TRAY_SETTINGS,
+          IDS_ASH_STATUS_TRAY_SETTINGS, IDS_ASH_STATUS_TRAY_SETTINGS,
+          kButtonRightBorder);
+      AddChildView(voice_button_);
     }
 
     if (show_handwriting_button) {
       // TODO(azurewei): Creates the proper button with icons.
+      handwriting_button_ = CreateImeMenuButton(
+          this, IDR_AURA_UBER_TRAY_SETTINGS, IDR_AURA_UBER_TRAY_SETTINGS,
+          IDR_AURA_UBER_TRAY_SETTINGS, IDR_AURA_UBER_TRAY_SETTINGS,
+          IDS_ASH_STATUS_TRAY_SETTINGS, IDS_ASH_STATUS_TRAY_SETTINGS,
+          kButtonRightBorder);
+      AddChildView(handwriting_button_);
     }
 
     if (show_settings_button) {
@@ -183,6 +223,7 @@ class ImeButtonsView : public views::View,
     }
   }
 
+  ImeMenuTray* ime_menu_tray_;
   TrayPopupHeaderButton* emoji_button_;
   TrayPopupHeaderButton* voice_button_;
   TrayPopupHeaderButton* handwriting_button_;
@@ -195,7 +236,9 @@ class ImeButtonsView : public views::View,
 }  // namespace
 
 ImeMenuTray::ImeMenuTray(WmShelf* wm_shelf)
-    : TrayBackgroundView(wm_shelf), label_(new ImeMenuLabel()) {
+    : TrayBackgroundView(wm_shelf),
+      label_(new ImeMenuLabel()),
+      force_to_show_keyboard_(false) {
   SetupLabelForTray(label_);
   tray_container()->AddChildView(label_);
   SetContentsBackground();
@@ -234,17 +277,64 @@ void ImeMenuTray::ShowImeMenuBubble() {
   LoginStatus login =
       WmShell::Get()->system_tray_delegate()->GetUserLoginStatus();
   if (login != LoginStatus::NOT_LOGGED_IN && login != LoginStatus::LOCKED &&
-      !WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen())
-    bubble_view->AddChildView(new ImeButtonsView(false, false, false, true));
+      !WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen()) {
+    if (InputMethodManager::Get() &&
+        InputMethodManager::Get()->IsEmojiHandwritingVoiceOnImeMenuEnabled() &&
+        !current_ime_.third_party) {
+      bubble_view->AddChildView(
+          new ImeButtonsView(this, true, true, true, true));
+    } else {
+      bubble_view->AddChildView(
+          new ImeButtonsView(this, false, false, false, true));
+    }
+  }
 
   bubble_.reset(new TrayBubbleWrapper(this, bubble_view));
   SetDrawBackgroundAsActive(true);
 }
 
+void ImeMenuTray::HideImeMenuBubble() {
+  bubble_.reset();
+  ime_list_view_ = nullptr;
+  SetDrawBackgroundAsActive(false);
+}
+
 bool ImeMenuTray::IsImeMenuBubbleShown() {
   return !!bubble_;
 }
 
+void ImeMenuTray::ShowKeyboardWithKeyset(const std::string& keyset) {

[James Cook, 2016/09/14 21:14:27]

I like this being here instead of in //chrome.

+  HideImeMenuBubble();
+
+  // Overrides the keyboard url ref to make it shown with the given keyset.
+  if (InputMethodManager::Get())
+    InputMethodManager::Get()->OverrideKeyboardRef(keyset);
+
+  // If onscreen keyboard has been enabled, shows the keyboard directly.
+  keyboard::KeyboardController* keyboard_controller =
+      keyboard::KeyboardController::GetInstance();
+  if (keyboard_controller) {
+    keyboard_controller->ShowKeyboard(false);
+    return;
+  }
+
+  AccessibilityDelegate* accessibility_delegate =
+      WmShell::Get()->accessibility_delegate();
+  // Fails to show the keyboard.
+  if (accessibility_delegate->IsVirtualKeyboardEnabled())
+    return;
+
+  // Onscreen keyboard has not been enabled yet, forces to bring out the
+  // keyboard for one time.
+  force_to_show_keyboard_ = true;
+  accessibility_delegate->SetVirtualKeyboardEnabled(true);
+  keyboard_controller = keyboard::KeyboardController::GetInstance();
+  if (keyboard_controller) {
+    keyboard_controller->AddObserver(this);
+    keyboard_controller->ShowKeyboard(false);
+  }
+}
+
 void ImeMenuTray::SetShelfAlignment(ShelfAlignment alignment) {
   TrayBackgroundView::SetShelfAlignment(alignment);
   if (!MaterialDesignController::IsShelfMaterial())
@@ -340,6 +430,22 @@ void ImeMenuTray::HideBubble(const views::TrayBubbleView* bubble_view) {
   HideBubbleWithView(bubble_view);
 }
 
+void ImeMenuTray::OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) {}
+
+void ImeMenuTray::OnKeyboardHidden() {
+  // If the keyboard is forced to be shown by IME menu for once, we need to
+  // disables the keyboard when it's hidden.

[James Cook, 2016/09/14 21:14:27]

nit: disables -> disable

[Azure Wei, 2016/09/15 03:44:51]

Done.

+  if (force_to_show_keyboard_) {

[James Cook, 2016/09/14 21:14:27]

optional nit: |force_show_keyboard_|?

optional nit:
if (!force_shelf_keyboard)
  return;

[Azure Wei, 2016/09/15 03:44:51]

Done.

+    keyboard::KeyboardController* keyboard_controller =
+        keyboard::KeyboardController::GetInstance();
+    if (keyboard_controller)
+      keyboard_controller->RemoveObserver(this);
+
+    WmShell::Get()->accessibility_delegate()->SetVirtualKeyboardEnabled(false);
+    force_to_show_keyboard_ = false;
+  }
+}
+
 void ImeMenuTray::UpdateTrayLabel() {
   WmShell::Get()->system_tray_delegate()->GetCurrentIME(&current_ime_);
 
@@ -350,10 +456,4 @@ void ImeMenuTray::UpdateTrayLabel() {
     label_->SetText(current_ime_.short_name);
 }
 
-void ImeMenuTray::HideImeMenuBubble() {
-  bubble_.reset();
-  ime_list_view_ = nullptr;
-  SetDrawBackgroundAsActive(false);
-}
-
 }  // namespace ash