Move more from WmShell to Shell

ash/common/system/chromeos/settings/tray_settings.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/chromeos/settings/tray_settings.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/chromeos/power/power_status.h"
 #include "ash/common/system/chromeos/power/power_status_view.h"
 #include "ash/common/system/tray/actionable_view.h"
 #include "ash/common/system/tray/fixed_sized_image_view.h"
 #include "ash/common/system/tray/system_tray_controller.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_utils.h"
 #include "ash/common/wm_shell.h"
 #include "ash/resources/grit/ash_resources.h"
+#include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
@@ skipping 53 matching lines @@
   ~SettingsDefaultView() override { PowerStatus::Get()->RemoveObserver(this); }
 
   // Overridden from ash::ActionableView.
   bool PerformAction(const ui::Event& event) override {
     if (login_status_ == LoginStatus::NOT_LOGGED_IN ||
         login_status_ == LoginStatus::LOCKED ||
         WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen()) {
       return false;
     }
 
-    WmShell::Get()->system_tray_controller()->ShowSettings();
+    Shell::Get()->system_tray_controller()->ShowSettings();
     CloseSystemBubble();
     return true;
   }
 
   // Overridden from views::View.
   void Layout() override {
     views::View::Layout();
 
     if (label_ && power_status_view_) {
       // Let the box-layout do the layout first. Then move power_status_view_
@@ skipping 41 matching lines @@
 TraySettings::~TraySettings() {}
 
 views::View* TraySettings::CreateTrayView(LoginStatus status) {
   return nullptr;
 }
 
 views::View* TraySettings::CreateDefaultView(LoginStatus status) {
   if ((status == LoginStatus::NOT_LOGGED_IN || status == LoginStatus::LOCKED) &&
       !PowerStatus::Get()->IsBatteryPresent())
     return nullptr;
-  if (!WmShell::Get()->system_tray_delegate()->ShouldShowSettings())
+  if (!Shell::Get()->system_tray_delegate()->ShouldShowSettings())
     return nullptr;
   CHECK(default_view_ == nullptr);
   default_view_ = new tray::SettingsDefaultView(this, status);
   return default_view_;
 }
 
 views::View* TraySettings::CreateDetailedView(LoginStatus status) {
   NOTIMPLEMENTED();
   return nullptr;
 }
 
 void TraySettings::DestroyTrayView() {}
 
 void TraySettings::DestroyDefaultView() {
   default_view_ = nullptr;
 }
 
 void TraySettings::DestroyDetailedView() {}
 
 void TraySettings::UpdateAfterLoginStatusChange(LoginStatus status) {}
 
 }  // namespace ash