| Index: content/browser/renderer_host/render_widget_host_view_aura.cc
|
| ===================================================================
|
| --- content/browser/renderer_host/render_widget_host_view_aura.cc (revision 189717)
|
| +++ content/browser/renderer_host/render_widget_host_view_aura.cc (working copy)
|
| @@ -67,6 +67,7 @@
|
| #include "ui/gfx/skia_util.h"
|
|
|
| #if defined(OS_WIN)
|
| +#include "base/win/windows_version.h"
|
| #include "content/browser/accessibility/browser_accessibility_manager_win.h"
|
| #include "content/browser/accessibility/browser_accessibility_win.h"
|
| #include "ui/base/win/hidden_window.h"
|
| @@ -265,6 +266,10 @@
|
| }
|
|
|
| bool ShouldSendPinchGesture() {
|
| +#if defined(OS_WIN)
|
| + if (base::win::GetVersion() >= base::win::VERSION_WIN8)
|
| + return true;
|
| +#endif
|
| static bool pinch_allowed =
|
| CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableViewport) ||
|
| CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnablePinch);
|
|
|