Chromium Code Reviews| Index: chrome/browser/tab_contents/render_view_host_delegate_helper.cc |
| =================================================================== |
| --- chrome/browser/tab_contents/render_view_host_delegate_helper.cc (revision 20520) |
| +++ chrome/browser/tab_contents/render_view_host_delegate_helper.cc (working copy) |
| @@ -155,9 +155,15 @@ |
| 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); |
|
Evan Martin
2009/07/13 21:39:07
what is this pref?
|
| +#endif |
| web_prefs.java_enabled = |
| !command_line.HasSwitch(switches::kDisableJava) && |
| prefs->GetBoolean(prefs::kWebKitJavaEnabled); |