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

ash/accelerators/accelerator_controller.cc

Index: ash/accelerators/accelerator_controller.cc
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index d2245475496cece962ca68342d9fa3d38f29e848..6584263deb217256d831f455bb98a4bc9d6cf46f 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -21,6 +21,8 @@
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/shell_window_ids.h"
+#include "ash/common/system/brightness_control_delegate.h"
+#include "ash/common/system/keyboard_brightness_control_delegate.h"
 #include "ash/common/system/system_notifier.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
@@ -48,8 +50,6 @@
 #include "ash/shelf/shelf_delegate.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
-#include "ash/system/brightness_control_delegate.h"
-#include "ash/system/keyboard_brightness/keyboard_brightness_control_delegate.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/touch/touch_hud_debug.h"
@@ -80,8 +80,8 @@
 #include "ui/message_center/notifier_settings.h"
 
 #if defined(OS_CHROMEOS)
+#include "ash/common/system/chromeos/keyboard_brightness_controller.h"
 #include "ash/display/display_configuration_controller.h"
-#include "ash/system/chromeos/keyboard_brightness_controller.h"
 #include "base/sys_info.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
@@ -554,18 +554,6 @@ void HandleUnpin() {
 }
 
 #if defined(OS_CHROMEOS)
-void HandleBrightnessDown(BrightnessControlDelegate* delegate,
-                          const ui::Accelerator& accelerator) {
-  if (delegate)
-    delegate->HandleBrightnessDown(accelerator);
-}
-
-void HandleBrightnessUp(BrightnessControlDelegate* delegate,
-                        const ui::Accelerator& accelerator) {
-  if (delegate)
-    delegate->HandleBrightnessUp(accelerator);
-}
-
 bool CanHandleDisableCapsLock(const ui::Accelerator& previous_accelerator) {
   ui::KeyboardCode previous_key_code = previous_accelerator.key_code();
   if (previous_accelerator.type() == ui::ET_KEY_RELEASED ||
@@ -807,11 +795,6 @@ AcceleratorController::GetCurrentAcceleratorRestriction() {
   return GetAcceleratorProcessingRestriction(-1);
 }
 
-void AcceleratorController::SetBrightnessControlDelegate(
-    std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate) {
-  brightness_control_delegate_ = std::move(brightness_control_delegate);
-}
-
 void AcceleratorController::SetImeControlDelegate(
     std::unique_ptr<ImeControlDelegate> ime_control_delegate) {
   ime_control_delegate_ = std::move(ime_control_delegate);
@@ -1280,12 +1263,20 @@ void AcceleratorController::PerformAction(AcceleratorAction action,
       HandleUnpin();
       break;
 #if defined(OS_CHROMEOS)
-    case BRIGHTNESS_DOWN:
-      HandleBrightnessDown(brightness_control_delegate_.get(), accelerator);
+    case BRIGHTNESS_DOWN: {
+      BrightnessControlDelegate* brightness_control_delegate =
+          WmShell::Get()->brightness_control_delegate();
+      if (brightness_control_delegate)
+        brightness_control_delegate->HandleBrightnessDown(accelerator);
       break;
-    case BRIGHTNESS_UP:
-      HandleBrightnessUp(brightness_control_delegate_.get(), accelerator);
+    }
+    case BRIGHTNESS_UP: {
+      BrightnessControlDelegate* brightness_control_delegate =
+          WmShell::Get()->brightness_control_delegate();
+      if (brightness_control_delegate)
+        brightness_control_delegate->HandleBrightnessUp(accelerator);
       break;
+    }
     case DEBUG_ADD_REMOVE_DISPLAY:
     case DEBUG_SHOW_TOAST:
     case DEBUG_TOGGLE_TOUCH_PAD: