chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.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_controller_delegate_chromeos.cc

Issue 10693087: chromeos: Request screen lock directly from session manager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: update Created 8 years, 6 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/notifications/system_notification.cc ('k') | chrome/browser/chromeos/power/power_button_observer.h » ('j') | chromeos/dbus/session_manager_client.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.cc b/chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.cc

index e67fb03b5378c4987cde3c24e5fbde4f072554e8..24bd760a28916596eabe103b10d43ceaec4ca381 100644

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

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

@@ -9,6 +9,7 @@

#include "chrome/browser/lifetime/application_lifetime.h"

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/power_manager_client.h"

+#include "chromeos/dbus/session_manager_client.h"

namespace chromeos {

@@ -22,8 +23,7 @@ void PowerButtonControllerDelegateChromeos::RequestLockScreen() {

return;

}

- DBusThreadManager::Get()->GetPowerManagerClient()->

- NotifyScreenLockRequested();

+ DBusThreadManager::Get()->GetSessionManagerClient()->RequestLockScreen();

}

void PowerButtonControllerDelegateChromeos::RequestShutdown() {