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

Unified Diff: chrome/browser/chromeos/power/power_button_observer.cc

Issue 326813004: Added quick lock mechanism while in Touchview (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added ASH_EXPORT to SessionStateAnimator Created 6 years, 3 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 | « ash/wm/session_state_animator_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/power/power_button_observer.cc
diff --git a/chrome/browser/chromeos/power/power_button_observer.cc b/chrome/browser/chromeos/power/power_button_observer.cc
index 8a74caeb0448f3ce2ec215889b85ac9a635e07d6..e7a27180f2dd82c9227fee2fe952dc8d4f80237e 100644
--- a/chrome/browser/chromeos/power/power_button_observer.cc
+++ b/chrome/browser/chromeos/power/power_button_observer.cc
@@ -15,6 +15,10 @@
#include "chromeos/dbus/dbus_thread_manager.h"
#include "content/public/browser/notification_service.h"
+namespace ash {
+class LockStateControllerDelegate;
+}
+
namespace chromeos {
namespace {
@@ -30,7 +34,8 @@ ash::user::LoginStatus GetCurrentLoginStatus() {
PowerButtonObserver::PowerButtonObserver() {
ash::Shell::GetInstance()->lock_state_controller()->
- SetDelegate(new SessionStateControllerDelegateChromeos);
+ SetDelegate(scoped_ptr<ash::LockStateControllerDelegate>(
+ new SessionStateControllerDelegateChromeos));
registrar_.Add(
this,
« no previous file with comments | « ash/wm/session_state_animator_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698