summaryrefslogtreecommitdiffstats
path: root/ash/shell.cc
diff options
context:
space:
mode:
authorderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-08 19:17:19 +0000
committerderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-08 19:17:19 +0000
commit5c04d3a953f95665b448a6d74fee79c22ac9d375 (patch)
tree4de5e4c5ffcc2158df3bef177529dd421d710f2c /ash/shell.cc
parent00016895fdcf0a081d812369c13ae5b9a9f7f04f (diff)
downloadchromium_src-5c04d3a953f95665b448a6d74fee79c22ac9d375.zip
chromium_src-5c04d3a953f95665b448a6d74fee79c22ac9d375.tar.gz
chromium_src-5c04d3a953f95665b448a6d74fee79c22ac9d375.tar.bz2
Revert r227544, "chromeos: Move several power-related ..."
This broke the ASAN builders. BUG=none TBR=oshima@chromium.org Review URL: https://codereview.chromium.org/26561002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227562 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
-rw-r--r--ash/shell.cc13
1 files changed, 2 insertions, 11 deletions
diff --git a/ash/shell.cc b/ash/shell.cc
index 94c0d4a..ff2e643 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -122,9 +122,6 @@
#endif // defined(USE_X11)
#include "ash/system/chromeos/brightness/brightness_controller_chromeos.h"
#include "ash/system/chromeos/power/power_status.h"
-#include "ash/system/chromeos/power/suspend_observer.h"
-#include "ash/system/chromeos/power/user_activity_notifier.h"
-#include "ash/system/chromeos/power/video_activity_notifier.h"
#endif // defined(OS_CHROMEOS)
namespace ash {
@@ -542,7 +539,7 @@ Shell::Shell(ShellDelegate* delegate)
activation_client_(NULL),
#if defined(OS_CHROMEOS) && defined(USE_X11)
output_configurator_(new chromeos::OutputConfigurator()),
-#endif // defined(OS_CHROMEOS) && defined(USE_X11)
+#endif // defined(OS_CHROMEOS)
native_cursor_manager_(new AshNativeCursorManager),
cursor_manager_(scoped_ptr<views::corewm::NativeCursorManager>(
native_cursor_manager_)),
@@ -872,17 +869,11 @@ void Shell::Init() {
env_filter_->set_cursor_hidden_by_filter(true);
}
-#if defined(OS_CHROMEOS)
// Set accelerator controller delegates.
+#if defined(OS_CHROMEOS)
accelerator_controller_->SetBrightnessControlDelegate(
scoped_ptr<ash::BrightnessControlDelegate>(
new ash::system::BrightnessControllerChromeos).Pass());
-
- suspend_observer_.reset(new internal::SuspendObserver());
- user_activity_notifier_.reset(
- new internal::UserActivityNotifier(user_activity_detector_.get()));
- video_activity_notifier_.reset(
- new internal::VideoActivityNotifier(video_detector_.get()));
#endif
// The compositor thread and main message loop have to be running in