chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc - Issue 11091023: 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/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 11091023: ash : Decouple power button controller and session state controller. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Fix power button cancel behaviour + unittest 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/session_state_controller_delegate_chromeos.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

index 6c71632d7d096dc7a49519cfb117c08bd5699ffd..b7da0f3a1dea6cc5cbf27939442d92d93984d0b2 100644

--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

@@ -44,7 +44,7 @@

#if defined(USE_AURA)

#include "ash/shell.h"

-#include "ash/wm/power_button_controller.h"

+#include "ash/wm/session_state_controller.h"

#endif

using content::BrowserThread;

@@ -626,7 +626,7 @@ void SigninScreenHandler::HandleOfflineLogin(const base::ListValue* args) {

void SigninScreenHandler::HandleShutdownSystem(const base::ListValue* args) {

#if defined(USE_AURA)

// Display the shutdown animation before actually requesting shutdown.

- ash::Shell::GetInstance()->power_button_controller()->RequestShutdown();

+ ash::Shell::GetInstance()->session_state_controller()->RequestShutdown();

#else

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

#endif

« no previous file with comments | « chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »