chrome/browser/profiles/profile_manager.cc - Issue 11689004: Move PromoResourceService from Profile to BrowserProcessImpl/local_state().

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/profiles/profile_manager.cc

Issue 11689004: Move PromoResourceService from Profile to BrowserProcessImpl/local_state(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 12 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/profiles/profile_impl.cc ('k') | chrome/browser/ui/webui/ntp/android/promo_handler.cc » ('j') | chrome/browser/web_resource/notification_promo.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile_manager.cc

diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc

index e766c539750a2f13e54482c26b1f9e7767f30360..a9e14b6e51b706979cf1906a0e34ae4595e48145 100644

--- a/chrome/browser/profiles/profile_manager.cc

+++ b/chrome/browser/profiles/profile_manager.cc

@@ -702,8 +702,8 @@ void ProfileManager::DoFinalInit(Profile* profile, bool go_off_the_record) {

void ProfileManager::DoFinalInitForServices(Profile* profile,

bool go_off_the_record) {

- const CommandLine& command_line = *CommandLine::ForCurrentProcess();

#if defined(ENABLE_EXTENSIONS)

+ const CommandLine& command_line = *CommandLine::ForCurrentProcess();

if (!IsImportProcess(command_line)) {

extensions::ExtensionSystem::Get(profile)->InitForRegularProfile(

!go_off_the_record);

@@ -715,8 +715,6 @@ void ProfileManager::DoFinalInitForServices(Profile* profile,

}

#endif

- if (!command_line.HasSwitch(switches::kDisableWebResources))

- profile->InitPromoResources();

}

void ProfileManager::DoFinalInitLogging(Profile* profile) {