Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(120)

Unified Diff: chrome/browser/renderer_host/browser_render_process_host.cc

Issue 190010: Revert 24846 - Enable extensions by default.... (Closed) Base URL: svn://chrome-svn/chrome/branches/205/src/
Patch Set: Created 11 years, 4 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
Index: chrome/browser/renderer_host/browser_render_process_host.cc
===================================================================
--- chrome/browser/renderer_host/browser_render_process_host.cc (revision 25203)
+++ chrome/browser/renderer_host/browser_render_process_host.cc (working copy)
@@ -349,6 +349,25 @@
}
}
+ // 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()) {
+ if (profile()->GetExtensionsService()->extensions()->size() > 0 ||
+ profile()->GetExtensionsService()->extensions_enabled())
+ cmd_line.AppendSwitch(switches::kEnableExtensions);
+ }
+
// Pass on the browser locale.
const std::string locale = g_browser_process->GetApplicationLocale();
cmd_line.AppendSwitchWithValue(switches::kLang, ASCIIToWide(locale));
« no previous file with comments | « chrome/browser/profile.cc ('k') | chrome/browser/renderer_host/test/render_view_host_manager_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698