| Index: chrome/browser/tab_contents/render_view_host_delegate_helper.cc
|
| 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 0610f2531e1bd4bd4d26eaf0618b1238cdaf2981..1c1ca24ded65b1abd5bb8dfd8605d404ae7e503b 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) or defined(OS_MACOSX)
|
| +#if defined(OS_WIN) || defined(OS_MACOSX)
|
| web_prefs.plugins_enabled =
|
| !command_line.HasSwitch(switches::kDisablePlugins) &&
|
| prefs->GetBoolean(prefs::kWebKitPluginsEnabled);
|
|
|