summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-14 18:41:33 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-14 18:41:33 +0000
commit05aed6b38effd2df95481e4ebd69b42978c3ee64 (patch)
tree82c016e5abd6f20a463cd1e0167da97a32fce749 /chrome/browser/tab_contents
parentf4a4c9232e8854abaf7d731e9121cb9bcf66d591 (diff)
downloadchromium_src-05aed6b38effd2df95481e4ebd69b42978c3ee64.zip
chromium_src-05aed6b38effd2df95481e4ebd69b42978c3ee64.tar.gz
chromium_src-05aed6b38effd2df95481e4ebd69b42978c3ee64.tar.bz2
linux: enable plugins by default
This is long overdue. Review URL: http://codereview.chromium.org/193100 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26129 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
-rw-r--r--chrome/browser/tab_contents/render_view_host_delegate_helper.cc6
1 files changed, 0 insertions, 6 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 9a5d1a7..ac286a7 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -157,15 +157,9 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
web_prefs.web_security_enabled =
!command_line.HasSwitch(switches::kDisableWebSecurity) &&
prefs->GetBoolean(prefs::kWebKitWebSecurityEnabled);
-#if defined(OS_WIN) || defined(OS_MACOSX)
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);