Move more from WmShell to Shell

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 171 matching lines @@
     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();
+    Shell::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.
@@ skipping 72 matching lines @@
 
 bool TrayIME::ShouldShowKeyboardToggle() {
   return keyboard_suppressed_ && !Shell::GetInstance()
                                       ->accessibility_delegate()
                                       ->IsVirtualKeyboardEnabled();
 }
 
 base::string16 TrayIME::GetDefaultViewLabel(bool show_ime_label) {
   if (show_ime_label) {
     IMEInfo current;
-    WmShell::Get()->system_tray_delegate()->GetCurrentIME(&current);
+    Shell::Get()->system_tray_delegate()->GetCurrentIME(&current);
     return current.name;
   } else {
     // Display virtual keyboard status instead.
     int id = keyboard::IsKeyboardEnabled()
                  ? IDS_ASH_STATUS_TRAY_KEYBOARD_ENABLED
                  : IDS_ASH_STATUS_TRAY_KEYBOARD_DISABLED;
     return ui::ResourceBundle::GetSharedInstance().GetLocalizedString(id);
   }
 }
 
@@ skipping 31 matching lines @@
 void TrayIME::DestroyDefaultView() {
   default_ = NULL;
 }
 
 void TrayIME::DestroyDetailedView() {
   detailed_ = NULL;
 }
 
 void TrayIME::OnIMERefresh() {
   // Caches the current ime state.
-  SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
+  SystemTrayDelegate* delegate = Shell::Get()->system_tray_delegate();
   ime_list_.clear();
   property_list_.clear();
   delegate->GetCurrentIME(&current_ime_);
   delegate->GetAvailableIMEList(&ime_list_);
   delegate->GetCurrentIMEProperties(&property_list_);
   ime_managed_message_ = delegate->GetIMEManagedMessage();
 
   Update();
 }
 
@@ skipping 22 matching lines @@
   return ime_count >= threshold;
 }
 
 ImeListView::SingleImeBehavior TrayIME::GetSingleImeBehavior() {
   // If managed, we also want to show a single IME.
   return IsIMEManaged() ? ImeListView::SHOW_SINGLE_IME
                         : ImeListView::HIDE_SINGLE_IME;
 }
 
 }  // namespace ash