chrome/browser/chromeos/power/power_button_observer.cc - Issue 10693087: chromeos: Request screen lock directly from session manager.

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 10693087: chromeos: Request screen lock directly from session manager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: remove locking-related metrics code Created 8 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:

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 a10e5b5ff1edac94b235c46c2e7a0e3308599dca..57742ec10d1bae50f3579bffcdbc71487429c720 100644

--- a/chrome/browser/chromeos/power/power_button_observer.cc

+++ b/chrome/browser/chromeos/power/power_button_observer.cc

@@ -51,6 +51,7 @@ PowerButtonObserver::PowerButtonObserver() {

content::NotificationService::AllSources());

DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);

+ DBusThreadManager::Get()->GetSessionManagerClient()->AddObserver(this);

// Tell the controller about the initial state.

ash::Shell::GetInstance()->OnLoginStateChanged(GetCurrentLoginStatus());

@@ -61,6 +62,7 @@ PowerButtonObserver::PowerButtonObserver() {

}

PowerButtonObserver::~PowerButtonObserver() {

+ DBusThreadManager::Get()->GetSessionManagerClient()->RemoveObserver(this);

DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);

}