Chromium Code Reviews| Index: ash/shell.cc |
| diff --git a/ash/shell.cc b/ash/shell.cc |
| index 3183c7ad8f3811ba7e932c3d7ea78e5c49e05b5e..1d95130943f3341557d3af53896bb869dac1ee85 100644 |
| --- a/ash/shell.cc |
| +++ b/ash/shell.cc |
| @@ -126,6 +126,7 @@ |
| #include "ash/accelerators/spoken_feedback_toggler.h" |
| #include "ash/common/ash_constants.h" |
| #include "ash/common/system/chromeos/bluetooth/bluetooth_notification_controller.h" |
| +#include "ash/common/system/chromeos/brightness/brightness_controller_chromeos.h" |
| #include "ash/common/system/chromeos/power/power_status.h" |
| #include "ash/display/display_change_observer_chromeos.h" |
| #include "ash/display/display_color_manager_chromeos.h" |
| @@ -134,7 +135,6 @@ |
| #include "ash/display/resolution_notification_controller.h" |
| #include "ash/display/screen_orientation_controller_chromeos.h" |
| #include "ash/sticky_keys/sticky_keys_controller.h" |
| -#include "ash/system/chromeos/brightness/brightness_controller_chromeos.h" |
| #include "ash/system/chromeos/power/power_event_observer.h" |
| #include "ash/system/chromeos/power/video_activity_notifier.h" |
| #include "ash/touch/touch_transformer_controller.h" |
| @@ -1073,10 +1073,8 @@ void Shell::Init(const ShellInitParams& init_params) { |
| } |
| #if defined(OS_CHROMEOS) |
| - // Set accelerator controller delegates. |
| - accelerator_controller_->SetBrightnessControlDelegate( |
| - std::unique_ptr<BrightnessControlDelegate>( |
| - new system::BrightnessControllerChromeos)); |
| + WmShell::Get()->SetBrightnessControlDelegate( |
|
msw
2016/07/07 22:41:59
I could move this to WmShell's ctor or similar; wd
James Cook
2016/07/07 23:08:49
I would try moving it to WmShell ctor. If that wor
msw
2016/07/08 01:40:48
Done.
|
| + base::WrapUnique(new system::BrightnessControllerChromeos)); |
| power_event_observer_.reset(new PowerEventObserver()); |
| user_activity_notifier_.reset( |