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

ash/common/wm_shell.h

 // Copyright 2016 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.
 
 #ifndef ASH_COMMON_WM_SHELL_H_
 #define ASH_COMMON_WM_SHELL_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/common/media_delegate.h"
 #include "ash/common/metrics/user_metrics_action.h"
+#include "base/gtest_prod_util.h"
 #include "base/observer_list.h"
 
-namespace gfx {
-class Rect;
-}
-
 namespace views {
 class PointerWatcher;
 }
 
 namespace ash {
 
 class AccessibilityDelegate;
+class BrightnessControlDelegate;
 class DisplayInfo;
 class FocusCycler;
+class KeyboardBrightnessControlDelegate;
 class KeyboardUI;
 class MaximizeModeController;
 class MruWindowTracker;
 class ScopedDisableInternalMouseAndKeyboard;
 class SessionStateDelegate;
 class ShellDelegate;
 class ShellObserver;
 class SystemTrayDelegate;
 class SystemTrayNotifier;
 class WindowResizer;
 class WindowSelectorController;
 class WmActivationObserver;
 class WmDisplayObserver;
-class WmRootWindowController;
 class WmWindow;
 
 namespace wm {
 class MaximizeModeEventHandler;
 class WindowState;
 }
 
 #if defined(OS_CHROMEOS)
 class LogoutConfirmationController;
 #endif
 
 // Similar to ash::Shell. Eventually the two will be merged.
 class ASH_EXPORT WmShell {
  public:
   // This is necessary for a handful of places that is difficult to plumb
   // through context.
   static void Set(WmShell* instance);
   static WmShell* Get();
   static bool HasInstance() { return instance_ != nullptr; }
 
   ShellDelegate* delegate() { return delegate_.get(); }
 
+  BrightnessControlDelegate* brightness_control_delegate() const {

[James Cook, 2016/07/08 16:29:34]

see below

[msw, 2016/07/08 17:18:58]

Done.

+    return brightness_control_delegate_.get();
+  }
+
   FocusCycler* focus_cycler() { return focus_cycler_.get(); }
 
+  KeyboardBrightnessControlDelegate* keyboard_brightness_control_delegate()
+      const {

[James Cook, 2016/07/08 16:29:34]

I don't think we generally make these sorts of accessors const (ones that return
a non-const pointer). I think sky@ makes the argument that since the returned
object is mutable it's not possible to guarantee the caller doesn't change
internal state.

[msw, 2016/07/08 17:18:58]

Done.

+    return keyboard_brightness_control_delegate_.get();
+  }
+
   KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); }
 
   MaximizeModeController* maximize_mode_controller() {
     return maximize_mode_controller_.get();
   }
 
   MruWindowTracker* mru_window_tracker() { return mru_window_tracker_.get(); }
 
   MediaDelegate* media_delegate() { return media_delegate_.get(); }
 
@@ skipping 131 matching lines @@
 #endif
 
  protected:
   explicit WmShell(ShellDelegate* delegate);
   virtual ~WmShell();
 
   base::ObserverList<ShellObserver>* shell_observers() {
     return &shell_observers_;
   }
 
+  void SetBrightnessControlDelegate(
+      std::unique_ptr<BrightnessControlDelegate> delegate);
+
+  void SetKeyboardBrightnessControlDelegate(
+      std::unique_ptr<KeyboardBrightnessControlDelegate> delegate);
+
   void SetKeyboardUI(std::unique_ptr<KeyboardUI> keyboard_ui);
 
   // Helpers to set (and initialize) or destroy various delegates.
   // TODO(msw|jamescook): Remove these once ShellDelegate, etc. are ported.
   void SetMediaDelegate(std::unique_ptr<MediaDelegate> delegate);
   void SetSystemTrayDelegate(std::unique_ptr<SystemTrayDelegate> delegate);
   void DeleteSystemTrayDelegate();
 
   void DeleteWindowSelectorController();
 
   void CreateMaximizeModeController();
   void DeleteMaximizeModeController();
 
   void CreateMruWindowTracker();
   void DeleteMruWindowTracker();
 
  private:
   friend class Shell;
+  FRIEND_TEST_ALL_PREFIXES(AcceleratorControllerTest, GlobalAccelerators);

[James Cook, 2016/07/08 16:29:35]

Could you "friend AcceleratorControllerTest" then add setter methods like
AcceleratorControllerTest::SetKeyboardBrightnessControllerDelegate() that does
the kbc_delegate_.reset()?

I don't really like gtest_prod_util.h, especially in a widely included header
like this one.

[msw, 2016/07/08 17:18:58]

Done.

+  FRIEND_TEST_ALL_PREFIXES(AcceleratorControllerTest, DisallowedAtModalWindow);
 
   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<KeyboardBrightnessControlDelegate>
+      keyboard_brightness_control_delegate_;
   std::unique_ptr<KeyboardUI> keyboard_ui_;
   std::unique_ptr<MaximizeModeController> maximize_mode_controller_;
   std::unique_ptr<MediaDelegate> media_delegate_;
   std::unique_ptr<MruWindowTracker> mru_window_tracker_;
   std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
   std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
   std::unique_ptr<WindowSelectorController> window_selector_controller_;
 
   bool simulate_modal_window_open_for_testing_ = false;
 
 #if defined(OS_CHROMEOS)
   std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
 #endif
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_SHELL_H_