Move more from WmShell to Shell

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 49 matching lines @@
 // Returns the minimum with of IME menu.
 int GetMinimumMenuWidth() {
   return MaterialDesignController::IsSystemTrayMenuMaterial()
              ? kTrayMenuMinimumWidthMd
              : kTrayMenuMinimumWidth;
 }
 
 // Shows language and input settings page.
 void ShowIMESettings() {
   WmShell::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_IME_SHOW_DETAILED);
-  WmShell::Get()->system_tray_controller()->ShowIMESettings();
+  Shell::Get()->system_tray_controller()->ShowIMESettings();
 }
 
 // Records the number of times users click buttons in opt-in IME menu.
 void RecordButtonsClicked(const std::string& button_name) {
   enum {
     UNKNOWN = 0,
     EMOJI = 1,
     HANDWRITING = 2,
     VOICE = 3,
     // SETTINGS is not used for now.
     SETTINGS = 4,
     BUTTON_MAX
   } button = UNKNOWN;
   if (button_name == "emoji") {
     button = EMOJI;
   } else if (button_name == "hwt") {
     button = HANDWRITING;
   } else if (button_name == "voice") {
     button = VOICE;
   }
   UMA_HISTOGRAM_ENUMERATION("InputMethod.ImeMenu.EmojiHandwritingVoiceButton",
                             button, BUTTON_MAX);
 }
 
 // Returns true if the current screen is login or lock screen.
 bool IsInLoginOrLockScreen() {
   LoginStatus login =
-      WmShell::Get()->system_tray_delegate()->GetUserLoginStatus();
+      Shell::Get()->system_tray_delegate()->GetUserLoginStatus();
   return !TrayPopupUtils::CanOpenWebUISettings(login);
 }
 
 // Returns true if the current input context type is password.
 bool IsInPasswordInputContext() {
   return ui::IMEBridge::Get()->GetCurrentInputContext().type ==
          ui::TEXT_INPUT_TYPE_PASSWORD;
 }
 
 class ImeMenuLabel : public views::Label {
@@ skipping 419 matching lines @@
   if (bubble_)
     HideImeMenuBubble();
   else
     ShowImeMenuBubble();
   return true;
 }
 
 void ImeMenuTray::OnIMERefresh() {
   UpdateTrayLabel();
   if (bubble_ && ime_list_view_) {
-    SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
+    SystemTrayDelegate* delegate = Shell::Get()->system_tray_delegate();
     IMEInfoList list;
     delegate->GetAvailableIMEList(&list);
     IMEPropertyInfoList property_list;
     delegate->GetCurrentIMEProperties(&property_list);
     ime_list_view_->Update(list, property_list, false,
                            ImeListView::SHOW_SINGLE_IME);
   }
 }
 
 void ImeMenuTray::OnIMEMenuActivationChanged(bool is_activated) {
@@ skipping 80 matching lines @@
   force_show_keyboard_ = false;
 }
 
 void ImeMenuTray::OnKeyboardSuppressionChanged(bool suppressed) {
   if (suppressed != keyboard_suppressed_ && bubble_)
     HideImeMenuBubble();
   keyboard_suppressed_ = suppressed;
 }
 
 void ImeMenuTray::UpdateTrayLabel() {
-  WmShell::Get()->system_tray_delegate()->GetCurrentIME(&current_ime_);
+  Shell::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