summaryrefslogtreecommitdiffstats
path: root/chrome/browser/profile_manager.cc
diff options
context:
space:
mode:
authormirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-21 01:00:34 +0000
committermirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-21 01:00:34 +0000
commit0ef69c756f644654452dd9ce94ab95f14b6c998c (patch)
treecca6d5a31f07791216185e0a49cd5d271891a2c4 /chrome/browser/profile_manager.cc
parent2e3e1908a954a3e23ddc08ff7f2023b0d3b92a21 (diff)
downloadchromium_src-0ef69c756f644654452dd9ce94ab95f14b6c998c.zip
chromium_src-0ef69c756f644654452dd9ce94ab95f14b6c998c.tar.gz
chromium_src-0ef69c756f644654452dd9ce94ab95f14b6c998c.tar.bz2
Add the ability to change NTP logos using a command from the web resource server.
BUG=none TEST=none Review URL: http://codereview.chromium.org/3418020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60001 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile_manager.cc')
-rw-r--r--chrome/browser/profile_manager.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/profile_manager.cc b/chrome/browser/profile_manager.cc
index 7c7da9b..35aa664 100644
--- a/chrome/browser/profile_manager.cc
+++ b/chrome/browser/profile_manager.cc
@@ -180,6 +180,9 @@ bool ProfileManager::AddProfile(Profile* profile, bool init_extensions) {
profiles_.insert(profiles_.end(), profile);
if (init_extensions)
profile->InitExtensions();
+ const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+ if (!command_line.HasSwitch(switches::kDisableWebResources))
+ profile->InitWebResources();
return true;
}