diff options
| author | amanda@chromium.org <amanda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-13 21:33:09 +0000 |
|---|---|---|
| committer | amanda@chromium.org <amanda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-13 21:33:09 +0000 |
| commit | f6b1d3e64758a188d579cb4d0bb8fa011687ea21 (patch) | |
| tree | abdea2aac057598d52be177b11b11fe039e3436b /chrome/browser/tab_contents | |
| parent | d3c902b2f2d157a0e40cfe4f684c3e95fc27fc80 (diff) | |
| download | chromium_src-f6b1d3e64758a188d579cb4d0bb8fa011687ea21.zip chromium_src-f6b1d3e64758a188d579cb4d0bb8fa011687ea21.tar.gz chromium_src-f6b1d3e64758a188d579cb4d0bb8fa011687ea21.tar.bz2 | |
Add a temporary flag to enable plugins on the Mac and Linux while
leaving the default to "disabled" until they work better.
Temporary, for use by people who like living on the bleeding edge.
BUG=none
TEST=none
jam: review
evan,jon: FYI
Review URL: http://codereview.chromium.org/149570
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20540 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/render_view_host_delegate_helper.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc index 9a7a7c00..ec00ba5 100644 --- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc +++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc @@ -155,9 +155,15 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs( web_prefs.web_security_enabled = !command_line.HasSwitch(switches::kDisableWebSecurity) && prefs->GetBoolean(prefs::kWebKitWebSecurityEnabled); +#if defined(OS_WIN) web_prefs.plugins_enabled = !command_line.HasSwitch(switches::kDisablePlugins) && prefs->GetBoolean(prefs::kWebKitPluginsEnabled); +#else + web_prefs.plugins_enabled = + command_line.HasSwitch(switches::kEnablePlugins) && + prefs->GetBoolean(prefs::kWebKitPluginsEnabled); +#endif web_prefs.java_enabled = !command_line.HasSwitch(switches::kDisableJava) && prefs->GetBoolean(prefs::kWebKitJavaEnabled); |