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

ash/common/wm_shell.h

Index: ash/common/wm_shell.h
diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
index aa3036879cbed789f35a59495027ed0b0409226a..9fc08f7572eeb7f622edd10afd3aec01a3dbacc1 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -26,6 +26,7 @@ class PointerWatcher;
 namespace ash {
 
 class AccessibilityDelegate;
+class BrightnessControlDelegate;
 class DisplayInfo;
 class FocusCycler;
 class KeyboardUI;
@@ -44,6 +45,10 @@ class WmDisplayObserver;
 class WmRootWindowController;
 class WmWindow;
 
+namespace test {
+class AshTestBase;
+}
+
 namespace wm {
 class MaximizeModeEventHandler;
 class WindowState;
@@ -64,6 +69,10 @@ class ASH_EXPORT WmShell {
 
   ShellDelegate* delegate() { return delegate_.get(); }
 
+  BrightnessControlDelegate* brightness_control_delegate() const {
+    return brightness_control_delegate_.get();
+  }
+
   FocusCycler* focus_cycler() { return focus_cycler_.get(); }
 
   KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); }
@@ -217,6 +226,9 @@ class ASH_EXPORT WmShell {
     return &shell_observers_;
   }
 
+  void SetBrightnessControlDelegate(
+      std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate);
+
   void SetKeyboardUI(std::unique_ptr<KeyboardUI> keyboard_ui);
 
   // Helpers to set (and initialize) or destroy various delegates.
@@ -235,11 +247,14 @@ class ASH_EXPORT WmShell {
 
  private:
   friend class Shell;
+  friend class test::AshTestBase;

[msw, 2016/07/07 22:41:59]

I could instead make SetBrightnessControlDelegate public, add "friend class
AcceleratorControllerTest" with a forward decl, or something else(?); wdyt?

[James Cook, 2016/07/07 23:08:49]

I would friend AcceleratorControllerTest.

[msw, 2016/07/08 01:40:48]

Done.

 
   static WmShell* instance_;
 
   base::ObserverList<ShellObserver> shell_observers_;
   std::unique_ptr<ShellDelegate> delegate_;
+
+  std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_;
   std::unique_ptr<FocusCycler> focus_cycler_;
   std::unique_ptr<KeyboardUI> keyboard_ui_;
   std::unique_ptr<MaximizeModeController> maximize_mode_controller_;