diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-18 23:02:54 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-18 23:02:54 +0000 |
| commit | ea0c98cfa2849f95bf40238c9f476c9cebb22244 (patch) | |
| tree | ec81fe0c664cb6c0adddbd5d392313e8fbb93ec5 /chrome/browser/browser_main.cc | |
| parent | 1f70f0ca51d1c61d3a775507b2b69dcdf60e77df (diff) | |
| download | chromium_src-ea0c98cfa2849f95bf40238c9f476c9cebb22244.zip chromium_src-ea0c98cfa2849f95bf40238c9f476c9cebb22244.tar.gz chromium_src-ea0c98cfa2849f95bf40238c9f476c9cebb22244.tar.bz2 | |
First draft of web resource service; fetches data from a JSON feed
and stores it in user prefs, where it can be used by the new tab page.
BUG = http://crbug.com/13363
Review URL: http://codereview.chromium.org/125052
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index bfd77da..e0d37ae 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -110,7 +110,7 @@ #if defined(LINUX2) #include "chrome/browser/extensions/extension_protocols.h" -#endif // defined(LINUX2) +#endif // defined(LINUX2) #if defined(TOOLKIT_GTK) #include "chrome/common/gtk_util.h" @@ -790,6 +790,10 @@ int BrowserMain(const MainFunctionParams& parameters) { RecordBreakpadStatusUMA(metrics); // Start up the extensions service. This should happen before Start(). profile->InitExtensions(); + // Start up the web resource service. This starts loading data after a + // short delay so as not to interfere with startup time. + if (parsed_command_line.HasSwitch(switches::kWebResources)) + profile->InitWebResources(); int result_code = ResultCodes::NORMAL_EXIT; if (parameters.ui_task) { |