summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents
diff options
context:
space:
mode:
authorstuartmorgan@google.com <stuartmorgan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-31 22:53:31 +0000
committerstuartmorgan@google.com <stuartmorgan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-31 22:53:31 +0000
commitdc75d4823b598a9b9b313728a06f6b47d6a73929 (patch)
tree7f4ab4dbad3d7597c92a62e57288d32f0b96c345 /chrome/browser/tab_contents
parent7e3260b370a57bf0a1ffbbf63fdb024d3ce6f62b (diff)
downloadchromium_src-dc75d4823b598a9b9b313728a06f6b47d6a73929.zip
chromium_src-dc75d4823b598a9b9b313728a06f6b47d6a73929.tar.gz
chromium_src-dc75d4823b598a9b9b313728a06f6b47d6a73929.tar.bz2
Switch on plugins by default for the Mac
BUG=10809 TEST=Visit a sit with Flash content. Playback should work, interacting with the plugin is still buggy. Review URL: http://codereview.chromium.org/159729 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22209 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
-rw-r--r--chrome/browser/tab_contents/render_view_host_delegate_helper.cc2
1 files changed, 1 insertions, 1 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 37923a6..0610f25 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -155,7 +155,7 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
web_prefs.web_security_enabled =
!command_line.HasSwitch(switches::kDisableWebSecurity) &&
prefs->GetBoolean(prefs::kWebKitWebSecurityEnabled);
-#if defined(OS_WIN)
+#if defined(OS_WIN) or defined(OS_MACOSX)
web_prefs.plugins_enabled =
!command_line.HasSwitch(switches::kDisablePlugins) &&
prefs->GetBoolean(prefs::kWebKitPluginsEnabled);