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

ash/common/wm_shell.cc

 // 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.
 
 #include "ash/common/wm_shell.h"
 
 #include "ash/common/focus_cycler.h"
 #include "ash/common/keyboard/keyboard_ui.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/shell_window_ids.h"
-#include "ash/common/system/chromeos/session/logout_confirmation_controller.h"
+#include "ash/common/system/brightness_control_delegate.h"
+#include "ash/common/system/keyboard_brightness_control_delegate.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/overview/window_selector_controller.h"
 #include "ash/common/wm_window.h"
 #include "base/bind.h"
 #include "base/logging.h"
 
+#if defined(OS_CHROMEOS)
+#include "ash/common/system/chromeos/brightness/brightness_controller_chromeos.h"
+#include "ash/common/system/chromeos/keyboard_brightness_controller.h"
+#include "ash/common/system/chromeos/session/logout_confirmation_controller.h"
+#endif
+
 namespace ash {
 
 // static
 WmShell* WmShell::instance_ = nullptr;
 
 // static
 void WmShell::Set(WmShell* instance) {
   instance_ = instance;
 }
 
@@ skipping 20 matching lines @@
 }
 
 void WmShell::RemoveShellObserver(ShellObserver* observer) {
   shell_observers_.RemoveObserver(observer);
 }
 
 WmShell::WmShell(ShellDelegate* delegate)
     : delegate_(delegate),
       focus_cycler_(new FocusCycler),
       system_tray_notifier_(new SystemTrayNotifier),
-      window_selector_controller_(new WindowSelectorController()) {}
+      window_selector_controller_(new WindowSelectorController) {
+#if defined(OS_CHROMEOS)
+  brightness_control_delegate_.reset(new system::BrightnessControllerChromeos);

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

This seems cleaner than using separate preprocessor blocks in the initializer
list, or reordering members with cros-specific impls together in the decl. wdyt?

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

Yeah, I like this better. I hate ifdefs in initializer lists.

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

Acknowledged.

+  keyboard_brightness_control_delegate_.reset(new KeyboardBrightnessController);
+#endif
+}
 
 WmShell::~WmShell() {}
 
 bool WmShell::IsSystemModalWindowOpen() {
   if (simulate_modal_window_open_for_testing_)
     return true;
 
   // Traverse all system modal containers, and find its direct child window
   // with "SystemModal" setting, and visible.
   for (WmWindow* root : GetAllRootWindows()) {
     WmWindow* system_modal =
         root->GetChildByShellWindowId(kShellWindowId_SystemModalContainer);
     if (!system_modal)
       continue;
     for (const WmWindow* child : system_modal->GetChildren()) {
       if (child->IsSystemModal() && child->GetTargetVisibility()) {
         return true;
       }
     }
   }
   return false;
 }
 
+void WmShell::SetBrightnessControlDelegate(
+    std::unique_ptr<BrightnessControlDelegate> delegate) {
+  brightness_control_delegate_ = std::move(delegate);
+}
+
+void WmShell::SetKeyboardBrightnessControlDelegate(
+    std::unique_ptr<KeyboardBrightnessControlDelegate> delegate) {
+  keyboard_brightness_control_delegate_ = std::move(delegate);
+}
+
 void WmShell::SetKeyboardUI(std::unique_ptr<KeyboardUI> keyboard_ui) {
   keyboard_ui_ = std::move(keyboard_ui);
 }
 
 void WmShell::SetMediaDelegate(std::unique_ptr<MediaDelegate> delegate) {
   media_delegate_ = std::move(delegate);
 }
 
 void WmShell::SetSystemTrayDelegate(
     std::unique_ptr<SystemTrayDelegate> delegate) {
@@ skipping 31 matching lines @@
 
 void WmShell::CreateMruWindowTracker() {
   mru_window_tracker_.reset(new MruWindowTracker);
 }
 
 void WmShell::DeleteMruWindowTracker() {
   mru_window_tracker_.reset();
 }
 
 }  // namespace ash