mash: Migrate [Keyboard]Brightness code to ash/common.

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/system/chromeos/brightness/tray_brightness.h"
+#include "ash/common/system/chromeos/brightness/tray_brightness.h"
 
 #include <algorithm>
 
-#include "ash/accelerators/accelerator_controller.h"
 #include "ash/common/ash_constants.h"
 #include "ash/common/shell_observer.h"
+#include "ash/common/system/brightness_control_delegate.h"
 #include "ash/common/system/tray/fixed_sized_image_view.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm_shell.h"
-#include "ash/shell.h"
-#include "ash/system/brightness_control_delegate.h"
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/display/display.h"
 #include "ui/gfx/image/image.h"
@@ skipping 115 matching lines @@
   slider_->SetSize(gfx::Size(w, slider_->height()));
 }
 
 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;
-  AcceleratorController* ac = Shell::GetInstance()->accelerator_controller();
-  if (ac->brightness_control_delegate()) {
+  BrightnessControlDelegate* brightness_control_delegate =
+      WmShell::Get()->brightness_control_delegate();
+  if (brightness_control_delegate) {
     double percent = std::max(value * 100.0, kMinBrightnessPercent);
-    ac->brightness_control_delegate()->SetBrightnessPercent(percent, true);
+    brightness_control_delegate->SetBrightnessPercent(percent, true);
   }
 }
 
 void BrightnessView::SliderDragStarted(views::Slider* slider) {
   DCHECK_EQ(slider, slider_);
   dragging_ = true;
 }
 
 void BrightnessView::SliderDragEnded(views::Slider* slider) {
   DCHECK_EQ(slider, slider_);
@@ skipping 17 matching lines @@
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(
       this);
 }
 
 TrayBrightness::~TrayBrightness() {
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(
       this);
 }
 
 void TrayBrightness::GetInitialBrightness() {
-  BrightnessControlDelegate* delegate = Shell::GetInstance()
-                                            ->accelerator_controller()
-                                            ->brightness_control_delegate();
+  BrightnessControlDelegate* brightness_control_delegate =
+      WmShell::Get()->brightness_control_delegate();
   // Worrisome, but happens in unit tests, so don't log anything.
-  if (!delegate)
+  if (!brightness_control_delegate)
     return;
-  delegate->GetBrightnessPercent(
+  brightness_control_delegate->GetBrightnessPercent(
       base::Bind(&TrayBrightness::HandleInitialBrightness,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void TrayBrightness::HandleInitialBrightness(double percent) {
   if (!got_current_percent_)
     HandleBrightnessChanged(percent, false);
 }
 
 views::View* TrayBrightness::CreateTrayView(LoginStatus status) {
@@ skipping 59 matching lines @@
   if (!display::Display::HasInternalDisplay())
     return;
 
   if (brightness_view_)
     SetDetailedViewCloseDelay(kTrayPopupAutoCloseDelayInSeconds);
   else
     PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false);
 }
 
 }  // namespace ash