Adds emoji/handwriting/vocie buttons on opt-in IME menu.

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

 // Copyright 2016 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 "ash/common/system/chromeos/ime_menu/ime_menu_tray.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"
 #include "ash/common/shell_window_ids.h"
@@ skipping 62 matching lines @@
     SetBorder(
         views::Border::CreateSolidSidedBorder(1, 0, 0, 0, kBorderDarkColor));
 
     auto* box_layout = new views::BoxLayout(
         views::BoxLayout::kHorizontal, kTrayImeBottomRowPadding,
         kTrayImeBottomRowPadding, kTrayImeBottomRowPaddingBetweenItems);
     box_layout->SetDefaultFlex(1);
     SetLayoutManager(box_layout);
 
     if (show_emoji_button) {
-      // TODO(azurewei): Creates the proper button with icons.
+      emoji_button_ = CreateImeMenuButton(
+          this, IDR_AURA_UBER_TRAY_EMOJI, IDR_AURA_UBER_TRAY_EMOJI,
+          IDR_AURA_UBER_TRAY_EMOJI, IDR_AURA_UBER_TRAY_EMOJI,
+          IDS_ASH_STATUS_TRAY_EMOJI, IDS_ASH_STATUS_TRAY_EMOJI, 1);

[James Cook, 2016/08/23 16:01:22]

nit: Use a constant for 1, like const int right_border = 1;

[Azure Wei, 2016/09/18 05:40:02]

Removed this border.

+      AddChildView(emoji_button_);
     }
 
     if (show_voice_button) {
-      // TODO(azurewei): Creates the proper button with icons.
+      voice_button_ = CreateImeMenuButton(
+          this, IDR_AURA_UBER_TRAY_VOICE, IDR_AURA_UBER_TRAY_VOICE,
+          IDR_AURA_UBER_TRAY_VOICE, IDR_AURA_UBER_TRAY_VOICE,

[James Cook, 2016/08/23 16:01:22]

Should there be separate artwork for the disabled and hover states?

[Azure Wei, 2016/09/18 05:40:02]

Updated with vectorized icons instead of PNGs.

+          IDS_ASH_STATUS_TRAY_VOICE, IDS_ASH_STATUS_TRAY_VOICE, 1);
+      AddChildView(voice_button_);
     }
 
     if (show_handwriting_button) {
-      // TODO(azurewei): Creates the proper button with icons.
+      handwriting_button_ = CreateImeMenuButton(
+          this, IDR_AURA_UBER_TRAY_HANDWRITING, IDR_AURA_UBER_TRAY_HANDWRITING,
+          IDR_AURA_UBER_TRAY_HANDWRITING, IDR_AURA_UBER_TRAY_HANDWRITING,
+          IDS_ASH_STATUS_TRAY_HANDWRITING, IDS_ASH_STATUS_TRAY_HANDWRITING, 1);
+      AddChildView(handwriting_button_);
     }
 
     if (show_settings_button) {
       settings_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, 0);
       AddChildView(settings_button_);
     }
   }
@@ skipping 172 matching lines @@
   bubble_.reset(new ash::TrayBubbleWrapper(this, bubble_view));
   SetDrawBackgroundAsActive(true);
 }
 
 void ImeMenuTray::HideImeMenuBubble() {
   bubble_.reset();
   SetDrawBackgroundAsActive(false);
 }
 
 }  // namespace ash