diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-22 21:53:52 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-22 21:53:52 +0000 |
| commit | 2df4a3857876b0a0f45c57f1fe8e7a29b48fd248 (patch) | |
| tree | b06568a4187490649f199cc7b4318ba5b23e48b6 /chrome/browser/renderer_host | |
| parent | d4fa01ce3bc4264775acedd804e44738d3030084 (diff) | |
| download | chromium_src-2df4a3857876b0a0f45c57f1fe8e7a29b48fd248.zip chromium_src-2df4a3857876b0a0f45c57f1fe8e7a29b48fd248.tar.gz chromium_src-2df4a3857876b0a0f45c57f1fe8e7a29b48fd248.tar.bz2 | |
TBR: Fix dead tree.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18964 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host')
| -rw-r--r-- | chrome/browser/renderer_host/browser_render_process_host.cc | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index a865349..06405ed 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -30,7 +30,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/child_process_security_policy.h" #include "chrome/browser/extensions/extension_message_service.h" -#include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/extensions/user_script_master.h" #include "chrome/browser/history/history.h" #include "chrome/browser/plugin_service.h" @@ -274,6 +273,7 @@ bool BrowserRenderProcessHost::Init() { switches::kUseLowFragHeapCrt, switches::kEnableWebWorkers, switches::kEnableStatsTable, + switches::kEnableExtensions, switches::kDisableOutOfProcessDevTools, switches::kAutoSpellCorrect, switches::kDisableAudio, @@ -288,23 +288,6 @@ bool BrowserRenderProcessHost::Init() { } } - // Tell the renderer to enable extensions if there are any extensions loaded. - // - // NOTE: This is subtly different than just passing along whether - // --enable-extenisons is present in the browser process. For example, there - // is also an extensions.enabled preference, and there may be various special - // cases about whether to allow extensions to load. - // - // This introduces a race condition where the first renderer never gets - // extensions enabled, so we also set the flag if extensions_enabled(). This - // isn't perfect though, because of the special cases above. - // - // TODO(aa): We need to get rid of the need to pass this flag at all. It is - // only used in one place in the renderer. - if (profile()->GetExtensionsService()->extensions()->size() > 0 || - profile()->GetExtensionsService()->extensions_enabled()) - cmd_line.AppendSwitch(switches::kEnableExtensions); - // Pass on the browser locale. const std::wstring locale = g_browser_process->GetApplicationLocale(); cmd_line.AppendSwitchWithValue(switches::kLang, locale); |