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

ash/accelerators/accelerator_controller.h

 // Copyright (c) 2012 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_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
 #define ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
 
 #include <stddef.h>
 
 #include <map>
 #include <memory>
 #include <set>
 
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/accelerators/exit_warning_handler.h"
 #include "ash/ash_export.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/accelerators/accelerator_history.h"
 
 namespace ui {
 class AcceleratorManager;
 }
 
 namespace ash {
 
 struct AcceleratorData;
-class BrightnessControlDelegate;
 class ExitWarningHandler;
 class ImeControlDelegate;
 class KeyboardBrightnessControlDelegate;
 class ScreenshotDelegate;
 class VolumeControlDelegate;
 
 // AcceleratorController provides functions for registering or unregistering
 // global keyboard accelerators, which are handled earlier than any windows. It
 // also implements several handlers as an accelerator target.
 class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget {
@@ skipping 53 matching lines @@
   // can be consumed by web contents if needed.
   bool IsDeprecated(const ui::Accelerator& accelerator) const;
 
   // Performs the specified action if it is enabled. Returns whether the action
   // was performed successfully.
   bool PerformActionIfEnabled(AcceleratorAction action);
 
   // Returns the restriction for the current context.
   AcceleratorProcessingRestriction GetCurrentAcceleratorRestriction();
 
-  void SetBrightnessControlDelegate(
-      std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate);
   void SetImeControlDelegate(
       std::unique_ptr<ImeControlDelegate> ime_control_delegate);
   void SetScreenshotDelegate(
       std::unique_ptr<ScreenshotDelegate> screenshot_delegate);
-  BrightnessControlDelegate* brightness_control_delegate() const {
-    return brightness_control_delegate_.get();
-  }
   ScreenshotDelegate* screenshot_delegate() {
     return screenshot_delegate_.get();
   }
 
   // Provides access to the ExitWarningHandler for testing.
   ExitWarningHandler* GetExitWarningHandlerForTest() {
     return &exit_warning_handler_;
   }
 
   // Returns true if the menu should close in order to perform the accelerator.
@@ skipping 45 matching lines @@
 
   void SetKeyboardBrightnessControlDelegate(
       std::unique_ptr<KeyboardBrightnessControlDelegate>
           keyboard_brightness_control_delegate);
 
   std::unique_ptr<ui::AcceleratorManager> accelerator_manager_;
 
   // A tracker for the current and previous accelerators.
   std::unique_ptr<ui::AcceleratorHistory> accelerator_history_;
 
-  // TODO(derat): BrightnessControlDelegate is also used by the system tray;
-  // move it outside of this class.
-  std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_;
   std::unique_ptr<ImeControlDelegate> ime_control_delegate_;
   std::unique_ptr<KeyboardBrightnessControlDelegate>
       keyboard_brightness_control_delegate_;

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

I could also move this to WmShell for consistency, but it's not necessary nor
clearly better; wdyt?

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

Yeah, I would move it. It exists for tests and to have someone own
KeyboardBrightnessController. I think it makes sense to keep it with the other
one.

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

Done.

   std::unique_ptr<ScreenshotDelegate> screenshot_delegate_;
 
   // Handles the exit accelerator which requires a double press to exit and
   // shows a popup with an explanation.
   ExitWarningHandler exit_warning_handler_;
 
   // A map from accelerators to the AcceleratorAction values, which are used in
   // the implementation.
   std::map<ui::Accelerator, AcceleratorAction> accelerators_;
 
@@ skipping 21 matching lines @@
   std::set<int> actions_needing_window_;
   // Actions that can be performed without closing the menu (if one is present).
   std::set<int> actions_keeping_menu_open_;
 
   DISALLOW_COPY_AND_ASSIGN(AcceleratorController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_