mash: Move SystemTrayDelegate ownership to WmShell

ash/system/tray_accessibility.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/tray_accessibility.h"
 
 #include "ash/common/accessibility_delegate.h"
 #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/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_popup_label_button.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ash_resources.h"
@@ skipping 35 matching lines @@
   if (delegate->IsAutoclickEnabled())
     state |= A11Y_AUTOCLICK;
   if (delegate->IsVirtualKeyboardEnabled())
     state |= A11Y_VIRTUAL_KEYBOARD;
   if (delegate->IsBrailleDisplayConnected())
     state |= A11Y_BRAILLE_DISPLAY_CONNECTED;
   return state;
 }
 
 LoginStatus GetCurrentLoginStatus() {
-  return Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus();
+  return WmShell::Get()->system_tray_delegate()->GetUserLoginStatus();
 }
 
 }  // namespace
 
 namespace tray {
 
 class DefaultAccessibilityView : public TrayItemMore {
  public:
   explicit DefaultAccessibilityView(SystemTrayItem* owner)
       : TrayItemMore(owner, true) {
@@ skipping 208 matching lines @@
     Shell::GetInstance()->metrics()->RecordUserMetricsAction(
         delegate->IsVirtualKeyboardEnabled() ?
             ash::UMA_STATUS_AREA_DISABLE_VIRTUAL_KEYBOARD :
             ash::UMA_STATUS_AREA_ENABLE_VIRTUAL_KEYBOARD);
     delegate->SetVirtualKeyboardEnabled(!delegate->IsVirtualKeyboardEnabled());
   }
 }
 
 void AccessibilityDetailedView::ButtonPressed(views::Button* sender,
                                               const ui::Event& event) {
-  SystemTrayDelegate* tray_delegate =
-      Shell::GetInstance()->system_tray_delegate();
+  SystemTrayDelegate* tray_delegate = WmShell::Get()->system_tray_delegate();
   if (sender == help_view_)
     tray_delegate->ShowAccessibilityHelp();
   else if (sender == settings_view_)
     tray_delegate->ShowAccessibilitySettings();
 }
 
 }  // namespace tray
 
 ////////////////////////////////////////////////////////////////////////////////
 // ash::TrayAccessibility
@@ skipping 116 matching lines @@
     if (detailed_popup_)
       detailed_popup_->GetWidget()->Close();
     if (detailed_menu_)
       detailed_menu_->GetWidget()->Close();
   }
 
   previous_accessibility_state_ = accessibility_state;
 }
 
 }  // namespace ash