diff options
| author | erikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-26 19:50:52 +0000 |
|---|---|---|
| committer | erikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-26 19:50:52 +0000 |
| commit | f7e615a546e789ab97ecd21a4ce78036960b1476 (patch) | |
| tree | a5fef15fa2b283a81948b5d7f691bd02f25bcac3 /chrome/browser/browser_main.cc | |
| parent | d942a8925ca595f551db2cce689749000959550d (diff) | |
| download | chromium_src-f7e615a546e789ab97ecd21a4ce78036960b1476.zip chromium_src-f7e615a546e789ab97ecd21a4ce78036960b1476.tar.gz chromium_src-f7e615a546e789ab97ecd21a4ce78036960b1476.tar.bz2 | |
Enable extension protocols on all platforms. This should enable background pages and tab-hosted pages from extensions.
BUG=none
TEST=load an extension that has a background page and verify that the process is created (see chrome://extensions)
Review URL: http://codereview.chromium.org/149091
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19400 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 38842da..df94b45 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -30,6 +30,7 @@ #include "chrome/browser/browser_process_impl.h" #include "chrome/browser/browser_shutdown.h" #include "chrome/browser/dom_ui/chrome_url_data_manager.h" +#include "chrome/browser/extensions/extension_protocols.h" #include "chrome/browser/first_run.h" #include "chrome/browser/metrics/metrics_service.h" #include "chrome/browser/net/dns_global.h" @@ -86,7 +87,6 @@ #include "base/win_util.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_trial.h" -#include "chrome/browser/extensions/extension_protocols.h" #include "chrome/browser/jankometer.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/net/url_fixer_upper.h" @@ -108,10 +108,6 @@ #endif // defined(OS_WIN) -#if defined(LINUX2) -#include "chrome/browser/extensions/extension_protocols.h" -#endif // defined(LINUX2) - #if defined(TOOLKIT_GTK) #include "chrome/common/gtk_util.h" #endif @@ -718,10 +714,7 @@ int BrowserMain(const MainFunctionParams& parameters) { // Register our global network handler for chrome:// and // chrome-extension:// URLs. RegisterURLRequestChromeJob(); - -#if defined(OS_WIN) || defined(LINUX2) RegisterExtensionProtocols(); -#endif // In unittest mode, this will do nothing. In normal mode, this will create // the global GoogleURLTracker instance, which will promptly go to sleep for |