Move more from WmShell to Shell

ash/system/chromeos/screen_layout_observer.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/screen_layout_observer.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
@@ skipping 50 matching lines @@
     return base::string16();
 
   DCHECK(display->is_valid());
   return base::UTF8ToUTF16(display->size().ToString());
 }
 
 // Attempts to open the display settings, returns true if successful.
 bool OpenSettings() {
   // switch is intentionally introduced without default, to cause an error when
   // a new type of login status is introduced.
-  switch (WmShell::Get()->system_tray_delegate()->GetUserLoginStatus()) {
+  switch (Shell::Get()->system_tray_delegate()->GetUserLoginStatus()) {
     case LoginStatus::NOT_LOGGED_IN:
     case LoginStatus::LOCKED:
       return false;
 
     case LoginStatus::USER:
     case LoginStatus::OWNER:
     case LoginStatus::GUEST:
     case LoginStatus::PUBLIC:
     case LoginStatus::SUPERVISED:
     case LoginStatus::KIOSK_APP:
     case LoginStatus::ARC_KIOSK_APP:
-      SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
+      SystemTrayDelegate* delegate = Shell::Get()->system_tray_delegate();
       if (delegate->ShouldShowSettings()) {
-        WmShell::Get()->system_tray_controller()->ShowDisplaySettings();
+        Shell::Get()->system_tray_controller()->ShowDisplaySettings();
         return true;
       }
       break;
   }
 
   return false;
 }
 
 // Callback to handle a user selecting the notification view.
 void OpenSettingsFromNotification() {
@@ skipping 319 matching lines @@
       return true;
 
     default:
       // Mirror mode was turned off; other messages should be shown e.g.
       // extended mode is on, ... etc.
       return false;
   }
 }
 
 }  // namespace ash