chrome/browser/chrome_browser_main_extra_parts.cc - 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/chrome_browser_main_extra_parts.cc

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/chrome_browser_main_extra_parts.cc

diff --git a/chrome/browser/chrome_browser_main_extra_parts.cc b/chrome/browser/chrome_browser_main_extra_parts.cc

index 14362a34fefce9b831c7f2ac8d6f8d8af93ddd76..3188931795f0b511d6f37d1c3202a96c13dc5611 100644

--- a/chrome/browser/chrome_browser_main_extra_parts.cc

+++ b/chrome/browser/chrome_browser_main_extra_parts.cc

@@ -25,16 +25,10 @@ void ChromeBrowserMainExtraParts::PostMainMessageLoopStart() {

void ChromeBrowserMainExtraParts::ToolkitInitialized() {

}

-void ChromeBrowserMainExtraParts::PreProfileInit() {

+void ChromeBrowserMainExtraParts::PostBrowserProcessInit() {

}

-void ChromeBrowserMainExtraParts::PostProfileInit() {

-void ChromeBrowserMainExtraParts::PreBrowserStart() {

-void ChromeBrowserMainExtraParts::PostBrowserStart() {

+void ChromeBrowserMainExtraParts::PostProfileInitialized() {

}

void ChromeBrowserMainExtraParts::PreMainMessageLoopRun() {