Move yet more from WmShell to Shell

ash/wm/power_button_controller.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/wm/power_button_controller.h"
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/session/session_controller.h"
 #include "ash/common/system/chromeos/audio/tray_audio.h"
@@ skipping 86 matching lines @@
     // Restore volume.
     chromeos::CrasAudioHandler* audio_handler =
         chromeos::CrasAudioHandler::Get();
     audio_handler->SetOutputVolumePercentWithoutNotifyingObservers(
         volume_percent_before_screenshot_,
         chromeos::CrasAudioHandler::VOLUME_CHANGE_MAXIMIZE_MODE_SCREENSHOT);
     return;
   }
 
   const SessionController* const session_controller =
-      WmShell::Get()->session_controller();
+      Shell::Get()->session_controller();
   if (has_legacy_power_button_) {
     // If power button releases won't get reported correctly because we're not
     // running on official hardware, just lock the screen or shut down
     // immediately.
     if (down) {
       if (session_controller->CanLockScreen() &&
           !session_controller->IsUserSessionBlocked() &&
           !lock_state_controller_->LockRequested()) {
         lock_state_controller_->StartLockAnimationAndLockImmediately(false);
       } else {
@@ skipping 20 matching lines @@
     }
   }
 }
 
 void PowerButtonController::OnLockButtonEvent(
     bool down,
     const base::TimeTicks& timestamp) {
   lock_button_down_ = down;
 
   const SessionController* const session_controller =
-      WmShell::Get()->session_controller();
+      Shell::Get()->session_controller();
   if (!session_controller->CanLockScreen() ||
       session_controller->IsScreenLocked() ||
       lock_state_controller_->LockRequested() ||
       lock_state_controller_->ShutdownRequested()) {
     return;
   }
 
   // Give the power button precedence over the lock button.
   if (power_button_down_)
     return;
@@ skipping 32 matching lines @@
       internal_display_off && external_display_on;
 }
 
 void PowerButtonController::PowerButtonEventReceived(
     bool down,
     const base::TimeTicks& timestamp) {
   OnPowerButtonEvent(down, timestamp);
 }
 
 }  // namespace ash