chrome/browser/chromeos/chrome_browser_main_chromeos.h - Issue 8774035: Revert "chromeos: move screen lock handling to power manager client"

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.h

Issue 8774035: Revert "chromeos: move screen lock handling to power manager client" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Reverted 3 patches in correct order, without conflict Created 9 years 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/chrome_browser_main_chromeos.h

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

index 80df06671bd2539d95dcf19d5cdc8896cc83f2cb..449d9fae31b866133a4dacae76df5cf83750d7ba 100644

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

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

@@ -27,14 +27,9 @@ class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsLinux {

virtual void PreEarlyInitialization() OVERRIDE;

virtual void PreMainMessageLoopStart() OVERRIDE;

virtual void PostMainMessageLoopStart() OVERRIDE;

+ virtual void PreMainMessageLoopRun() OVERRIDE;

virtual void PostMainMessageLoopRun() OVERRIDE;

- // ChromeBrowserMainExtraParts overrodes.

- virtual void PreProfileInit() OVERRIDE;

- virtual void PostProfileInit() OVERRIDE;

- virtual void PreBrowserStart() OVERRIDE;

- virtual void PostBrowserStart() OVERRIDE;

private:

scoped_ptr<chromeos::BrightnessObserver> brightness_observer_;

scoped_ptr<chromeos::SessionManagerObserver> session_manager_observer_;