mash: Move SystemTrayDelegate ownership to WmShell

ash/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 <vector>
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
+#include "ash/common/wm_shell.h"
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/system/tray/hover_highlight_view.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/system/tray/tray_details_view.h"
 #include "ash/system/tray/tray_item_more.h"
 #include "ash/system/tray/tray_item_view.h"
@@ skipping 65 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(IMEDefaultView);
 };
 
 class IMEDetailedView : public TrayDetailsView, public ViewClickListener {
  public:
   IMEDetailedView(SystemTrayItem* owner,
                   LoginStatus login,
                   bool show_keyboard_toggle)
       : TrayDetailsView(owner), login_(login) {
-    SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
+    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);
   }
 
   ~IMEDetailedView() override {}
 
   void Update(const IMEInfoList& list,
@@ skipping 73 matching lines @@
     container->AddLabel(
         ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
             IDS_ASH_STATUS_TRAY_IME_SETTINGS),
         gfx::ALIGN_LEFT, false /* highlight */);
     AddChildView(container);
     settings_ = container;
   }
 
   // Overridden from ViewClickListener.
   void OnViewClicked(views::View* sender) override {
-    SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
+    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);
       delegate->ShowIMESettings();
     } else if (sender == keyboard_status_) {
       Shell::GetInstance()->virtual_keyboard_controller()
           ->ToggleIgnoreExternalKeyboard();
     } else {
@@ skipping 91 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;
-    Shell::GetInstance()->system_tray_delegate()->GetCurrentIME(&current);
+    WmShell::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 37 matching lines @@
 
 void TrayIME::UpdateAfterLoginStatusChange(LoginStatus status) {}
 
 void TrayIME::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
   SetTrayLabelItemBorder(tray_label_, alignment);
   tray_label_->Layout();
 }
 
 void TrayIME::OnIMERefresh() {
   // Caches the current ime state.
-  SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
+  SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
   ime_list_.clear();
   property_list_.clear();
   delegate->GetCurrentIME(&current_ime_);
   delegate->GetAvailableIMEList(&ime_list_);
   delegate->GetCurrentIMEProperties(&property_list_);
 
   Update();
 }
 
 void TrayIME::OnIMEMenuActivationChanged(bool is_active) {
   is_visible_ = !is_active;
   if (is_visible_)
     OnIMERefresh();
   else
     Update();
 }
 
 bool TrayIME::ShouldDefaultViewBeVisible() {
   return is_visible_ && (ime_list_.size() > 1 || property_list_.size() > 1 ||
                          ShouldShowKeyboardToggle());
 }
 
 }  // namespace ash