chrome/browser/chromeos/power/power_button_observer.cc - Issue 11185006: Revert 162140 - ash : Decouple power button controller and session state controller.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 11185006: Revert 162140 - ash : Decouple power button controller and session state controller. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 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 | « chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.cc ('k') | chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/power/power_button_observer.cc

===================================================================

--- chrome/browser/chromeos/power/power_button_observer.cc (revision 162199)

+++ chrome/browser/chromeos/power/power_button_observer.cc (working copy)

@@ -11,7 +11,7 @@

#include "chrome/browser/chromeos/login/screen_locker.h"

#include "chrome/browser/chromeos/login/user.h"

#include "chrome/browser/chromeos/login/user_manager.h"

-#include "chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.h"

+#include "chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.h"

#include "chrome/common/chrome_notification_types.h"

#include "chromeos/dbus/dbus_thread_manager.h"

#include "content/public/browser/notification_service.h"

@@ -34,8 +34,8 @@

} // namespace

PowerButtonObserver::PowerButtonObserver() {

- ash::Shell::GetInstance()->session_state_controller()->

- SetDelegate(new SessionStateControllerDelegateChromeos);

+ ash::Shell::GetInstance()->power_button_controller()->

+ set_delegate(new PowerButtonControllerDelegateChromeos);

registrar_.Add(

this,

@@ -100,7 +100,7 @@

}

void PowerButtonObserver::LockScreen() {

- ash::Shell::GetInstance()->session_state_controller()->OnStartingLock();

+ ash::Shell::GetInstance()->power_button_controller()->OnStartingLock();

}

} // namespace chromeos