Change UI of settings button on 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"
 #include "ash/common/system/chromeos/ime_menu/ime_list_view.h"
+#include "ash/common/system/tray/fixed_sized_image_view.h"
 #include "ash/common/system/tray/fixed_sized_scroll_view.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_header_button.h"
 #include "ash/common/system/tray/tray_utils.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 
 namespace ash {
 
 namespace {
 
 // Returns the max height of ImeListView.
 int GetImeListViewMaxHeight() {
   const int max_items = 7;
   return GetTrayConstant(TRAY_POPUP_ITEM_HEIGHT) * max_items;
 }
 
+// Shows language and input settings page.
+void ShowIMESettings() {
+  SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
+  WmShell::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_IME_SHOW_DETAILED);
+  delegate->ShowIMESettings();
+}
+
 class ImeMenuLabel : public views::Label {
  public:
   ImeMenuLabel() {}
   ~ImeMenuLabel() override {}
 
   // views:Label:
   gfx::Size GetPreferredSize() const override {
     return gfx::Size(kTrayImeIconSize, kTrayImeIconSize);
   }
   int GetHeightForWidth(int width) const override { return kTrayImeIconSize; }
@@ skipping 13 matching lines @@
   TrayPopupHeaderButton* button = new ash::TrayPopupHeaderButton(
       listener, enabled_resource_id, disabled_resource_id,
       enabled_resource_id_hover, disabled_resource_id_hover,
       accessible_name_id);
   button->SetTooltipText(l10n_util::GetStringUTF16(message_id));
   button->SetBorder(views::Border::CreateSolidSidedBorder(0, 0, 0, right_border,
                                                           kBorderDarkColor));
   return button;
 }
 
+// The IME menu settings view when there's only one button on the menu. It shows
+// the setting gear left-aligned with label.
+class ImeSettingButtonView : public ActionableView {
+ public:
+  explicit ImeSettingButtonView() {

[James Cook, 2016/08/26 16:09:24]

no explicit.

Only do this with single-parameter constructors.
https://google.github.io/styleguide/cppguide.html#Implicit_Conversions

[Azure Wei, 2016/08/26 22:09:57]

Done.

+    SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
+                                          ash::kTrayPopupPaddingHorizontal, 0,

[James Cook, 2016/08/26 16:09:24]

no ash::

[Azure Wei, 2016/08/26 22:09:57]

Done.

+                                          ash::kTrayPopupPaddingBetweenItems));
+
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+    views::ImageView* icon = new ash::FixedSizedImageView(

[James Cook, 2016/08/26 16:09:24]

no ash::

[Azure Wei, 2016/08/26 22:09:57]

Done.

+        0, GetTrayConstant(TRAY_POPUP_ITEM_HEIGHT));
+    icon->SetImage(rb.GetImageNamed(IDR_AURA_UBER_TRAY_SETTINGS).ToImageSkia());
+    icon->set_id(test::kSettingsTrayItemViewId);

[James Cook, 2016/08/26 16:09:24]

Do you have tests that need to look things up with this ID? If not, don't
reference test code in production code.

[Azure Wei, 2016/08/26 22:09:57]

Removed.

+    AddChildView(icon);
+
+    base::string16 text =
+        rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_INPUT_SETTINGS);
+    views::Label* label = new views::Label(text);
+    AddChildView(label);
+    SetAccessibleName(text);
+  }
+
+  ~ImeSettingButtonView() override {}
+
+  // ash::ActionableView.

[James Cook, 2016/08/26 16:09:24]

Just "ActionableView:"

[Azure Wei, 2016/08/26 22:09:56]

Done.

+  bool PerformAction(const ui::Event& event) override {
+    ShowIMESettings();
+    return true;
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ImeSettingButtonView);
+};
+
 class ImeButtonsView : public views::View, public views::ButtonListener {
  public:
   ImeButtonsView(bool show_emoji_button,
                  bool show_voice_button,
                  bool show_handwriting_button,
                  bool show_settings_button) {
     set_background(
         views::Background::CreateSolidBackground(kHeaderBackgroundColor));
     SetBorder(
         views::Border::CreateSolidSidedBorder(1, 0, 0, 0, kBorderDarkColor));
@@ skipping 10 matching lines @@
 
     if (show_voice_button) {
       // TODO(azurewei): Creates the proper button with icons.
     }
 
     if (show_handwriting_button) {
       // TODO(azurewei): Creates the proper button with icons.
     }
 
     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_);
+      // If there's only one button, we show the gear icon with text. Otherwise,
+      // just show the icon.
+      if (!show_emoji_button && !show_voice_button &&
+          !show_handwriting_button) {
+        settings_button_with_text_ = new ImeSettingButtonView();
+        AddChildView(settings_button_with_text_);
+      } else {
+        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_);
+      }
     }
   }
 
   ~ImeButtonsView() override {}
 
   // views::View:
   gfx::Size GetPreferredSize() const override {
     int size = GetTrayConstant(TRAY_POPUP_ITEM_HEIGHT);
     return gfx::Size(size, size);
   }
   int GetHeightForWidth(int width) const override {
     return GetTrayConstant(TRAY_POPUP_ITEM_HEIGHT);
   }
 
   // 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_) {
-      SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
-      WmShell::Get()->RecordUserMetricsAction(
-          UMA_STATUS_AREA_IME_SHOW_DETAILED);
-      delegate->ShowIMESettings();
+      ShowIMESettings();
     }
   }
 
  private:
   TrayPopupHeaderButton* emoji_button_;
   TrayPopupHeaderButton* voice_button_;
   TrayPopupHeaderButton* handwriting_button_;
   TrayPopupHeaderButton* settings_button_;
+  ImeSettingButtonView* settings_button_with_text_;
 
   DISALLOW_COPY_AND_ASSIGN(ImeButtonsView);
 };
 
 }  // namespace
 
 ImeMenuTray::ImeMenuTray(WmShelf* wm_shelf)
     : TrayBackgroundView(wm_shelf), label_(new ImeMenuLabel()) {
   SetupLabelForTray(label_);
   tray_container()->AddChildView(label_);
@@ skipping 134 matching lines @@
   bubble_.reset(new ash::TrayBubbleWrapper(this, bubble_view));
   SetDrawBackgroundAsActive(true);
 }
 
 void ImeMenuTray::HideImeMenuBubble() {
   bubble_.reset();
   SetDrawBackgroundAsActive(false);
 }
 
 }  // namespace ash