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

Unified Diff: athena/system/system_ui_impl.cc

Issue 654343002: Intorduce PowerButtonObserver API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: speculative fix Created 6 years, 2 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
« no previous file with comments | « athena/system/shutdown_dialog.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/system/system_ui_impl.cc
diff --git a/athena/system/system_ui_impl.cc b/athena/system/system_ui_impl.cc
index 894c1660c43ac06888dd80fce2f33d2e0db05e74..353a45bb395490e59579f38f4ef17dbea35815cc 100644
--- a/athena/system/system_ui_impl.cc
+++ b/athena/system/system_ui_impl.cc
@@ -7,7 +7,7 @@
#include "athena/screen/public/screen_manager.h"
#include "athena/system/background_controller.h"
#include "athena/system/orientation_controller.h"
-#include "athena/system/power_button_controller.h"
+#include "athena/system/shutdown_dialog.h"
#include "athena/system/status_icon_container_view.h"
#include "athena/system/time_view.h"
#include "athena/util/container_priorities.h"
@@ -106,8 +106,8 @@ class SystemUIImpl : public SystemUI {
// because it needs to show over the login screen.
// TODO(pkotwicz): Pick the most appropriate container based on whether the
// user has logged in.
- power_button_controller_.reset(
- new PowerButtonController(login_screen_system_modal_container_));
+ shutdown_dialog_.reset(
+ new ShutdownDialog(login_screen_system_modal_container_));
background_controller_.reset(
new BackgroundController(background_container_));
}
@@ -122,7 +122,7 @@ class SystemUIImpl : public SystemUI {
private:
scoped_ptr<OrientationController> orientation_controller_;
- scoped_ptr<PowerButtonController> power_button_controller_;
+ scoped_ptr<ShutdownDialog> shutdown_dialog_;
scoped_ptr<BackgroundController> background_controller_;
// The parent container for the background.
« no previous file with comments | « athena/system/shutdown_dialog.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698