diff options
| author | stuartmorgan@google.com <stuartmorgan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-31 23:17:16 +0000 |
|---|---|---|
| committer | stuartmorgan@google.com <stuartmorgan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-31 23:17:16 +0000 |
| commit | a287cc480eff74f26d8a3b61e7db432ad42d84dd (patch) | |
| tree | dfb27158441ec928c44ff6deabc112ca9603df5e | |
| parent | 5f64d6a44ea1fbeeb47a5ff7d989fb3d14f07a6a (diff) | |
| download | chromium_src-a287cc480eff74f26d8a3b61e7db432ad42d84dd.zip chromium_src-a287cc480eff74f26d8a3b61e7db432ad42d84dd.tar.gz chromium_src-a287cc480eff74f26d8a3b61e7db432ad42d84dd.tar.bz2 | |
Fix or/|| mistake in ifdef
TBR=mark
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/160487
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22216 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/tab_contents/render_view_host_delegate_helper.cc | 2 |
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 0610f25..1c1ca24 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); |