UI changes 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/accessibility_delegate.h"
 #include "ash/common/ash_constants.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
@@ skipping 113 matching lines @@
         gfx::Insets(kMenuSeparatorVerticalPadding - kSeparatorWidth, 0)));
     auto* box_layout =
         new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0);
     box_layout->set_minimum_cross_axis_size(
         GetTrayConstant(TRAY_POPUP_ITEM_MIN_HEIGHT));
     SetLayoutManager(box_layout);
     title_label_ =
         new views::Label(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_IME));
     title_label_->SetBorder(views::CreateEmptyBorder(
         0, kMenuEdgeEffectivePadding, kTrayMenuBottomRowPadding, 0));
+    UpdateStyle();
     title_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     AddChildView(title_label_);
     box_layout->SetFlexForView(title_label_, 1);
 
     if (show_settings_button) {
       settings_button_ = CreateImeMenuButton(
           this, kSystemMenuSettingsIcon, IDS_ASH_STATUS_TRAY_IME_SETTINGS, 0);
       if (IsInLoginOrLockScreen())
         settings_button_->SetEnabled(false);
       AddChildView(settings_button_);
     }
   }
 
+  void UpdateStyle() {
+    if (!GetNativeTheme() || !title_label_) {
+      return;
+    }
+
+    TrayPopupItemStyle style(GetNativeTheme(),
+                             TrayPopupItemStyle::FontStyle::TITLE);
+    style.SetupLabel(title_label_);
+  }
+
   // views::View:
   void OnNativeThemeChanged(const ui::NativeTheme* theme) override {
-    TrayPopupItemStyle style(theme, TrayPopupItemStyle::FontStyle::TITLE);
-    style.SetupLabel(title_label_);
+    UpdateStyle();
   }
 
   // views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override {
     DCHECK_EQ(sender, settings_button_);
     ShowIMESettings();
   }
 
   ~ImeTitleView() override {}
 
@@ skipping 85 matching lines @@
       one_settings_button_view_->SetEnabled(false);
     AddChildView(one_settings_button_view_);
   }
 
   // Shows the UI of more than one buttons.
   void ShowButtons(bool show_emoji_button,
                    bool show_handwriting_button,
                    bool show_voice_button,
                    bool show_settings_button) {
     if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
-      SetLayoutManager(
-          new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
+      auto* box_layout =
+          new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0);
+      box_layout->set_minimum_cross_axis_size(
+          GetTrayConstant(TRAY_POPUP_ITEM_MIN_HEIGHT));
+      SetLayoutManager(box_layout);
       SetBorder(views::CreatePaddedBorder(
           views::CreateSolidSidedBorder(kSeparatorWidth, 0, 0, 0,
                                         kHorizontalSeparatorColor),
           gfx::Insets(kMenuSeparatorVerticalPadding - kSeparatorWidth,
                       GetTrayConstant(TRAY_POPUP_ITEM_LEFT_INSET))));
     } else {
       auto* box_layout =
           new views::BoxLayout(views::BoxLayout::kHorizontal, 4, 4, 0);
       set_background(
           views::Background::CreateSolidBackground(kHeaderBackgroundColor));
@@ skipping 369 matching lines @@
   WmShell::Get()->system_tray_delegate()->GetCurrentIME(&current_ime_);
 
   // Updates the tray label based on the current input method.
   if (current_ime_.third_party)
     label_->SetText(current_ime_.short_name + base::UTF8ToUTF16("*"));
   else
     label_->SetText(current_ime_.short_name);
 }
 
 }  // namespace ash