Merge 247390 "Enable pinch-to-zoom on Windows 8 by default"

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
===================================================================
--- chrome/browser/chrome_content_browser_client.cc	(revision 248582)
+++ chrome/browser/chrome_content_browser_client.cc	(working copy)
@@ -147,6 +147,7 @@
 #include "webkit/common/webpreferences.h"
 
 #if defined(OS_WIN)
+#include "base/win/windows_version.h"
 #include "chrome/browser/chrome_browser_main_win.h"
 #include "sandbox/win/src/sandbox_policy.h"
 #elif defined(OS_MACOSX)
@@ -1432,6 +1433,11 @@
           chromeos::switches::kLoginProfile, login_profile);
 #endif
 
+#if defined(OS_WIN)
+  if (base::win::GetVersion() >= base::win::VERSION_WIN8)
+    command_line->AppendSwitch(switches::kEnablePinch);
+#endif
+
 #if defined(ENABLE_WEBRTC)
     if (VersionInfo::GetChannel() <= VersionInfo::CHANNEL_DEV) {
       static const char* const kWebRtcDevSwitchNames[] = {