Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(753)

Unified Diff: ash/shell.cc

Issue 2131733002: mash: Migrate [Keyboard]Brightness code to ash/common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup. Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 3183c7ad8f3811ba7e932c3d7ea78e5c49e05b5e..bd4696c51aaee8da3e22ad9a96465be71c12b229 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -134,7 +134,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,11 +1072,6 @@ 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));
-
power_event_observer_.reset(new PowerEventObserver());
user_activity_notifier_.reset(
new ui::UserActivityPowerManagerNotifier(user_activity_detector_.get()));

Powered by Google App Engine
This is Rietveld 408576698