mash: Migrate tray IME view to wm common types, move to //ash/common

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/system/ime/tray_ime_chromeos.h"
+#include "ash/common/system/ime/tray_ime_chromeos.h"
 
 #include <vector>
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_details_view.h"
 #include "ash/common/system/tray/tray_item_more.h"
 #include "ash/common/system/tray/tray_item_view.h"
 #include "ash/common/system/tray/tray_utils.h"
 #include "ash/common/system/tray/wm_system_tray_notifier.h"
 #include "ash/common/system/tray_accessibility.h"
 #include "ash/common/wm_shell.h"
-#include "ash/metrics/user_metrics_recorder.h"
-#include "ash/root_window_controller.h"
-#include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
-#include "ash/system/tray/system_tray_notifier.h"
-#include "ash/virtual_keyboard_controller.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/accessibility/ax_enums.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
 #include "ui/keyboard/keyboard_util.h"
@@ skipping 81 matching lines @@
       AppendIMEList(list);
     if (!property_list.empty())
       AppendIMEProperties(property_list);
 
     if (show_keyboard_toggle) {
       if (list.size() > 1 || !property_list.empty())
         AddScrollSeparator();
       AppendKeyboardStatus();
     }
 
-    bool userAddingRunning = ash::Shell::GetInstance()
-                                 ->session_state_delegate()
-                                 ->IsInSecondaryLoginScreen();
     if (login_ != LoginStatus::NOT_LOGGED_IN && login_ != LoginStatus::LOCKED &&
-        !userAddingRunning)
+        !WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen())
       AppendSettings();
     AppendHeaderEntry();
 
     Layout();
     SchedulePaint();
   }
 
  private:
   void AppendHeaderEntry() { CreateSpecialRow(IDS_ASH_STATUS_TRAY_IME, this); }
 
@@ skipping 44 matching lines @@
     AddChildView(container);
     settings_ = container;
   }
 
   // Overridden from ViewClickListener.
   void OnViewClicked(views::View* sender) override {
     SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
     if (sender == footer()->content()) {
       TransitionToDefaultView();
     } else if (sender == settings_) {
-      Shell::GetInstance()->metrics()->RecordUserMetricsAction(
-          ash::UMA_STATUS_AREA_IME_SHOW_DETAILED);
+      WmShell::Get()->RecordUserMetricsAction(
+          UMA_STATUS_AREA_IME_SHOW_DETAILED);
       delegate->ShowIMESettings();
     } else if (sender == keyboard_status_) {
-      Shell::GetInstance()->virtual_keyboard_controller()
-          ->ToggleIgnoreExternalKeyboard();
+      WmShell::Get()->ToggleIgnoreExternalKeyboard();
     } else {
       std::map<views::View*, std::string>::const_iterator ime_find;
       ime_find = ime_map_.find(sender);
       if (ime_find != ime_map_.end()) {
-        Shell::GetInstance()->metrics()->RecordUserMetricsAction(
-            ash::UMA_STATUS_AREA_IME_SWITCH_MODE);
+        WmShell::Get()->RecordUserMetricsAction(
+            UMA_STATUS_AREA_IME_SWITCH_MODE);
         std::string ime_id = ime_find->second;
         delegate->SwitchIME(ime_id);
         GetWidget()->Close();
       } else {
         std::map<views::View*, std::string>::const_iterator prop_find;
         prop_find = property_map_.find(sender);
         if (prop_find != property_map_.end()) {
           const std::string key = prop_find->second;
           delegate->ActivateIMEProperty(key);
           GetWidget()->Close();
@@ skipping 14 matching lines @@
 
 }  // namespace tray
 
 TrayIME::TrayIME(SystemTray* system_tray)
     : SystemTrayItem(system_tray),
       tray_label_(NULL),
       default_(NULL),
       detailed_(NULL),
       keyboard_suppressed_(false),
       is_visible_(true) {
-  Shell::GetInstance()->system_tray_notifier()->AddIMEObserver(this);
-  Shell::GetInstance()->system_tray_notifier()->AddVirtualKeyboardObserver(
-      this);
-  WmShell::Get()->system_tray_notifier()->AddAccessibilityObserver(this);
+  WmSystemTrayNotifier* tray_notifier = WmShell::Get()->system_tray_notifier();
+  tray_notifier->AddVirtualKeyboardObserver(this);
+  tray_notifier->AddAccessibilityObserver(this);
+  tray_notifier->AddIMEObserver(this);
 }
 
 TrayIME::~TrayIME() {
-  Shell::GetInstance()->system_tray_notifier()->RemoveIMEObserver(this);
-  WmShell::Get()->system_tray_notifier()->RemoveAccessibilityObserver(this);
-  Shell::GetInstance()->system_tray_notifier()->RemoveVirtualKeyboardObserver(
-      this);
+  WmSystemTrayNotifier* tray_notifier = WmShell::Get()->system_tray_notifier();
+  tray_notifier->RemoveIMEObserver(this);
+  tray_notifier->RemoveAccessibilityObserver(this);
+  tray_notifier->RemoveVirtualKeyboardObserver(this);
 }
 
 void TrayIME::OnKeyboardSuppressionChanged(bool suppressed) {
   keyboard_suppressed_ = suppressed;
   Update();
 }
 
 void TrayIME::OnAccessibilityModeChanged(
     AccessibilityNotificationVisibility notify) {
   Update();
@@ skipping 22 matching lines @@
     } else {
       tray_label_->label()->SetText(current.short_name);
     }
     SetTrayLabelItemBorder(tray_label_, system_tray()->shelf_alignment());
     tray_label_->Layout();
   }
 }
 
 bool TrayIME::ShouldShowKeyboardToggle() {
   return keyboard_suppressed_ &&
-         !Shell::GetInstance()
-              ->accessibility_delegate()
+         !WmShell::Get()
+              ->GetAccessibilityDelegate()
               ->IsVirtualKeyboardEnabled();
 }
 
 base::string16 TrayIME::GetDefaultViewLabel(bool show_ime_label) {
   if (show_ime_label) {
     IMEInfo current;
     WmShell::Get()->system_tray_delegate()->GetCurrentIME(&current);
     return current.name;
   } else {
     // Display virtual keyboard status instead.
@@ skipping 68 matching lines @@
   else
     Update();
 }
 
 bool TrayIME::ShouldDefaultViewBeVisible() {
   return is_visible_ && (ime_list_.size() > 1 || property_list_.size() > 1 ||
                          ShouldShowKeyboardToggle());
 }
 
 }  // namespace ash