chrome/browser/chromeos/chrome_browser_main_chromeos.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/chromeos/chrome_browser_main_chromeos.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: 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

« ash/wm/session_state_controller.h ('K') | « ash/wm/session_state_controller.cc ('k') | chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

index 28664f9dcc4454d835eec2cb46cd884ab86eb6ef..2810acdc05cd40bb51436890971b33d10b429002 100644

--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

@@ -44,11 +44,11 @@

#include "chrome/browser/chromeos/oom_priority_manager.h"

#include "chrome/browser/chromeos/power/brightness_observer.h"

#include "chrome/browser/chromeos/power/output_observer.h"

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

#include "chrome/browser/chromeos/power/power_button_observer.h"

#include "chrome/browser/chromeos/power/resume_observer.h"

#include "chrome/browser/chromeos/power/screen_dimming_observer.h"

#include "chrome/browser/chromeos/power/screen_lock_observer.h"

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

Daniel Erat 2012/10/09 17:28:55 is this include needed, or can you just delete it?

Denis Kuznetsov (DE-MUC) 2012/10/11 11:37:12 Done.

#include "chrome/browser/chromeos/power/user_activity_notifier.h"

#include "chrome/browser/chromeos/power/video_activity_notifier.h"

#include "chrome/browser/chromeos/settings/device_settings_service.h"