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

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 129 matching lines @@
 #include "net/ssl/ssl_cert_request_info.h"
 #include "ppapi/host/ppapi_host.h"
 #include "ppapi/shared_impl/ppapi_switches.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/message_center/message_center_util.h"
 #include "webkit/browser/fileapi/external_mount_points.h"
 #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)
 #include "chrome/browser/chrome_browser_main_mac.h"
 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h"
 #include "components/breakpad/app/breakpad_mac.h"
 #elif defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
 #include "chrome/browser/chromeos/drive/file_system_backend_delegate.h"
 #include "chrome/browser/chromeos/fileapi/file_system_backend.h"
@@ skipping 1265 matching lines @@
   if (process_type == switches::kRendererProcess) {
 #if defined(OS_CHROMEOS)
     const std::string& login_profile =
         browser_command_line.GetSwitchValueASCII(
             chromeos::switches::kLoginProfile);
     if (!login_profile.empty())
       command_line->AppendSwitchASCII(
           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[] = {
         switches::kDisableWebRtcEncryption,
       };
       command_line->CopySwitchesFrom(browser_command_line,
                                      kWebRtcDevSwitchNames,
                                      arraysize(kWebRtcDevSwitchNames));
     }
 #endif
@@ skipping 1195 matching lines @@
 
   chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
   return channel <= chrome::VersionInfo::CHANNEL_DEV;
 #else
   return false;
 #endif
 }
 
 
 }  // namespace chrome