Move more from WmShell to Shell

ash/common/system/chromeos/brightness/tray_brightness.cc

 // Copyright 2013 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/brightness/tray_brightness.h"
 
 #include <algorithm>
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shell_observer.h"
@@ skipping 142 matching lines @@
 }
 
 void BrightnessView::SliderValueChanged(views::Slider* sender,
                                         float value,
                                         float old_value,
                                         views::SliderChangeReason reason) {
   DCHECK_EQ(sender, slider_);
   if (reason != views::VALUE_CHANGED_BY_USER)
     return;
   BrightnessControlDelegate* brightness_control_delegate =
-      WmShell::Get()->brightness_control_delegate();
+      Shell::Get()->brightness_control_delegate();
   if (brightness_control_delegate) {
     double percent = std::max(value * 100.0, kMinBrightnessPercent);
     brightness_control_delegate->SetBrightnessPercent(percent, true);
   }
 }
 
 void BrightnessView::SliderDragStarted(views::Slider* slider) {
   DCHECK_EQ(slider, slider_);
   dragging_ = true;
 }
@@ skipping 21 matching lines @@
       this);
 }
 
 TrayBrightness::~TrayBrightness() {
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(
       this);
 }
 
 void TrayBrightness::GetInitialBrightness() {
   BrightnessControlDelegate* brightness_control_delegate =
-      WmShell::Get()->brightness_control_delegate();
+      Shell::Get()->brightness_control_delegate();
   // Worrisome, but happens in unit tests, so don't log anything.
   if (!brightness_control_delegate)
     return;
   brightness_control_delegate->GetBrightnessPercent(
       base::Bind(&TrayBrightness::HandleInitialBrightness,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void TrayBrightness::HandleInitialBrightness(double percent) {
   if (!got_current_percent_)
@@ skipping 59 matching lines @@
   if (!display::Display::HasInternalDisplay())
     return;
 
   if (brightness_view_ && brightness_view_->visible())
     SetDetailedViewCloseDelay(kTrayPopupAutoCloseDelayInSeconds);
   else
     PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false);
 }
 
 }  // namespace ash