Implement all system menu title row buttons for Ash MD

ash/common/system/ime/tray_ime_chromeos.cc

 // Copyright (c) 2012 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/ime/tray_ime_chromeos.h"
 
 #include <vector>
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
@@ skipping 95 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(IMEDefaultView);
 };
 
 class IMEDetailedView : public ImeListView {
  public:
   IMEDetailedView(SystemTrayItem* owner,
                   LoginStatus login,
                   bool show_keyboard_toggle)
       : ImeListView(owner, show_keyboard_toggle, ImeListView::HIDE_SINGLE_IME),
-        login_(login) {
+        login_(login),
+        settings_(nullptr),
+        settings_button_(nullptr) {
     SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
     IMEInfoList list;
     delegate->GetAvailableIMEList(&list);
     IMEPropertyInfoList property_list;
     delegate->GetCurrentIMEProperties(&property_list);
     Update(list, property_list, show_keyboard_toggle,
            ImeListView::HIDE_SINGLE_IME);
   }
 
   ~IMEDetailedView() override {}
 
   void Update(const IMEInfoList& list,
               const IMEPropertyInfoList& property_list,
               bool show_keyboard_toggle,
               SingleImeBehavior single_ime_behavior) override {
     ImeListView::Update(list, property_list, show_keyboard_toggle,
                         single_ime_behavior);
-    if (login_ != LoginStatus::NOT_LOGGED_IN && login_ != LoginStatus::LOCKED &&
-        !WmShell::Get()
-             ->GetSessionStateDelegate()
-             ->IsInSecondaryLoginScreen()) {
+    if (!MaterialDesignController::IsSystemTrayMenuMaterial() &&
+        CanOpenWebUISettings(login_)) {
       AppendSettings();
     }
 
     CreateTitleRow(IDS_ASH_STATUS_TRAY_IME);
   }
 
  private:
   // ImeListView:
   void HandleViewClicked(views::View* view) override {
     ImeListView::HandleViewClicked(view);
-    if (view == settings_) {
-      WmShell::Get()->RecordUserMetricsAction(
-          UMA_STATUS_AREA_IME_SHOW_DETAILED);
-      WmShell::Get()->system_tray_controller()->ShowIMESettings();
-    }
+    if (view == settings_)
+      ShowSettings();
+  }
+
+  void HandleButtonPressed(views::Button* sender,
+                           const ui::Event& event) override {
+    if (sender == settings_button_)
+      ShowSettings();
+  }
+
+  void CreateExtraTitleRowButtons() override {
+    if (MaterialDesignController::IsSystemTrayMenuMaterial())
+      settings_button_ = title_row()->AddSettingsButton(this, login_);
   }
 
   void AppendSettings() {
     HoverHighlightView* container = new HoverHighlightView(this);
     container->AddLabel(
         ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
             IDS_ASH_STATUS_TRAY_IME_SETTINGS),
         gfx::ALIGN_LEFT, false /* highlight */);
     AddChildView(container);
     settings_ = container;
   }
 
+  void ShowSettings() {
+    WmShell::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_IME_SHOW_DETAILED);
+    WmShell::Get()->system_tray_controller()->ShowIMESettings();
+    if (owner()->system_tray())
+      owner()->system_tray()->CloseSystemBubble();
+  }
+
   LoginStatus login_;
 
+  // Not used in material design.
   views::View* settings_;
 
+  // Only used in material design.
+  views::Button* settings_button_;
+
   DISALLOW_COPY_AND_ASSIGN(IMEDetailedView);
 };
 
 }  // namespace tray
 
 TrayIME::TrayIME(SystemTray* system_tray)
     : SystemTrayItem(system_tray, UMA_IME),
       tray_label_(NULL),
       default_(NULL),
       detailed_(NULL),
@@ skipping 134 matching lines @@
   else
     Update();
 }
 
 bool TrayIME::ShouldDefaultViewBeVisible() {
   return is_visible_ && (ime_list_.size() > 1 || property_list_.size() > 1 ||
                          ShouldShowKeyboardToggle());
 }
 
 }  // namespace ash