Move yet 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_controller.h"
 #include "ash/common/system/chromeos/power/power_status.h"
 #include "ash/common/system/chromeos/power/power_status_view.h"
@@ skipping 32 matching lines @@
         label_(nullptr),
         power_status_view_(nullptr) {
     PowerStatus::Get()->AddObserver(this);
     SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
                                           ash::kTrayPopupPaddingHorizontal, 0,
                                           ash::kTrayPopupPaddingBetweenItems));
 
     bool power_view_right_align = false;
     if (login_status_ != LoginStatus::NOT_LOGGED_IN &&
         login_status_ != LoginStatus::LOCKED &&
-        !WmShell::Get()->session_controller()->IsInSecondaryLoginScreen()) {
+        !Shell::Get()->session_controller()->IsInSecondaryLoginScreen()) {
       ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
       views::ImageView* icon = TrayPopupUtils::CreateMainImageView();
 
       icon->SetImage(
           rb.GetImageNamed(IDR_AURA_UBER_TRAY_SETTINGS).ToImageSkia());
       icon->set_id(test::kSettingsTrayItemViewId);
       AddChildView(icon);
 
       base::string16 text = rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_SETTINGS);
       label_ = TrayPopupUtils::CreateDefaultLabel();
@@ skipping 13 matching lines @@
     if (MaterialDesignController::IsSystemTrayMenuMaterial())
       SetInkDropMode(InkDropHostView::InkDropMode::ON);
   }
 
   ~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()->session_controller()->IsInSecondaryLoginScreen()) {
+        Shell::Get()->session_controller()->IsInSecondaryLoginScreen()) {
       return false;
     }
 
     Shell::Get()->system_tray_controller()->ShowSettings();
     CloseSystemBubble();
     return true;
   }
 
   // Overridden from views::View.
   void Layout() override {
@@ skipping 68 matching lines @@
 
 void TraySettings::DestroyDefaultView() {
   default_view_ = nullptr;
 }
 
 void TraySettings::DestroyDetailedView() {}
 
 void TraySettings::UpdateAfterLoginStatusChange(LoginStatus status) {}
 
 }  // namespace ash