mash: Move SystemTrayDelegate ownership to WmShell

ash/system/chromeos/tray_display.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/chromeos/tray_display.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "ash/common/system/tray/fixed_sized_image_view.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/display/display_manager.h"
 #include "ash/display/screen_orientation_controller_chromeos.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/shell.h"
 #include "ash/system/chromeos/devicetype_utils.h"
 #include "ash/system/system_notifier.h"
 #include "ash/system/tray/actionable_view.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/tray_notification_view.h"
 #include "base/bind.h"
@@ skipping 86 matching lines @@
       continue;
     lines.push_back(GetDisplayInfoLine(id));
   }
 
   return base::JoinString(lines, base::ASCIIToUTF16("\n"));
 }
 
 void OpenSettings() {
   // switch is intentionally introduced without default, to cause an error when
   // a new type of login status is introduced.
-  switch (Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus()) {
+  switch (WmShell::Get()->system_tray_delegate()->GetUserLoginStatus()) {
     case LoginStatus::NOT_LOGGED_IN:
     case LoginStatus::LOCKED:
       return;
 
     case LoginStatus::USER:
     case LoginStatus::OWNER:
     case LoginStatus::GUEST:
     case LoginStatus::PUBLIC:
     case LoginStatus::SUPERVISED:
     case LoginStatus::KIOSK_APP:
-      ash::SystemTrayDelegate* delegate =
-          Shell::GetInstance()->system_tray_delegate();
+      SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
       if (delegate->ShouldShowSettings())
         delegate->ShowDisplaySettings();
   }
 }
 
 }  // namespace
 
 const char TrayDisplay::kNotificationId[] = "chrome://settings/display";
 
 class DisplayView : public ActionableView {
@@ skipping 282 matching lines @@
   default_ = NULL;
 }
 
 void TrayDisplay::OnDisplayConfigurationChanged() {
   DisplayInfoMap old_info;
   UpdateDisplayInfo(&old_info);
 
   if (default_)
     default_->Update();
 
-  if (!Shell::GetInstance()->system_tray_delegate()->
-          ShouldShowDisplayNotification()) {
+  if (!WmShell::Get()
+           ->system_tray_delegate()
+           ->ShouldShowDisplayNotification()) {
     return;
   }
 
   base::string16 message;
   base::string16 additional_message;
   if (GetDisplayMessageForNotification(old_info, &message, &additional_message))
     CreateOrUpdateNotification(message, additional_message);
 }
 
 base::string16 TrayDisplay::GetDefaultViewMessage() const {
   if (!default_ || !default_->visible())
     return base::string16();
 
   return static_cast<DisplayView*>(default_)->label()->text();
 }
 
 bool TrayDisplay::GetAccessibleStateForTesting(ui::AXViewState* state) {
   views::View* view = default_;
   if (view) {
     view->GetAccessibleState(state);
     return true;
   }
   return false;
 }
 
 }  // namespace ash