Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(524)

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 148083009: Enable pinch-to-zoom on Windows 8 by default (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | content/browser/frame_host/render_widget_host_view_guest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 #include "net/ssl/ssl_cert_request_info.h" 144 #include "net/ssl/ssl_cert_request_info.h"
145 #include "ppapi/host/ppapi_host.h" 145 #include "ppapi/host/ppapi_host.h"
146 #include "ppapi/shared_impl/ppapi_switches.h" 146 #include "ppapi/shared_impl/ppapi_switches.h"
147 #include "ui/base/l10n/l10n_util.h" 147 #include "ui/base/l10n/l10n_util.h"
148 #include "ui/base/resource/resource_bundle.h" 148 #include "ui/base/resource/resource_bundle.h"
149 #include "ui/message_center/message_center_util.h" 149 #include "ui/message_center/message_center_util.h"
150 #include "webkit/browser/fileapi/external_mount_points.h" 150 #include "webkit/browser/fileapi/external_mount_points.h"
151 #include "webkit/common/webpreferences.h" 151 #include "webkit/common/webpreferences.h"
152 152
153 #if defined(OS_WIN) 153 #if defined(OS_WIN)
154 #include "base/win/windows_version.h"
154 #include "chrome/browser/chrome_browser_main_win.h" 155 #include "chrome/browser/chrome_browser_main_win.h"
155 #include "sandbox/win/src/sandbox_policy.h" 156 #include "sandbox/win/src/sandbox_policy.h"
156 #elif defined(OS_MACOSX) 157 #elif defined(OS_MACOSX)
157 #include "chrome/browser/chrome_browser_main_mac.h" 158 #include "chrome/browser/chrome_browser_main_mac.h"
158 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h" 159 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h"
159 #include "components/breakpad/app/breakpad_mac.h" 160 #include "components/breakpad/app/breakpad_mac.h"
160 #elif defined(OS_CHROMEOS) 161 #elif defined(OS_CHROMEOS)
161 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" 162 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
162 #include "chrome/browser/chromeos/drive/file_system_backend_delegate.h" 163 #include "chrome/browser/chromeos/drive/file_system_backend_delegate.h"
163 #include "chrome/browser/chromeos/fileapi/file_system_backend.h" 164 #include "chrome/browser/chromeos/fileapi/file_system_backend.h"
(...skipping 1278 matching lines...) Expand 10 before | Expand all | Expand 10 after
1442 if (process_type == switches::kRendererProcess) { 1443 if (process_type == switches::kRendererProcess) {
1443 #if defined(OS_CHROMEOS) 1444 #if defined(OS_CHROMEOS)
1444 const std::string& login_profile = 1445 const std::string& login_profile =
1445 browser_command_line.GetSwitchValueASCII( 1446 browser_command_line.GetSwitchValueASCII(
1446 chromeos::switches::kLoginProfile); 1447 chromeos::switches::kLoginProfile);
1447 if (!login_profile.empty()) 1448 if (!login_profile.empty())
1448 command_line->AppendSwitchASCII( 1449 command_line->AppendSwitchASCII(
1449 chromeos::switches::kLoginProfile, login_profile); 1450 chromeos::switches::kLoginProfile, login_profile);
1450 #endif 1451 #endif
1451 1452
1453 #if defined(OS_WIN)
1454 if (base::win::GetVersion() >= base::win::VERSION_WIN8)
1455 command_line->AppendSwitch(switches::kEnablePinch);
1456 #endif
1457
1452 #if defined(ENABLE_WEBRTC) 1458 #if defined(ENABLE_WEBRTC)
1453 if (VersionInfo::GetChannel() <= VersionInfo::CHANNEL_DEV) { 1459 if (VersionInfo::GetChannel() <= VersionInfo::CHANNEL_DEV) {
1454 static const char* const kWebRtcDevSwitchNames[] = { 1460 static const char* const kWebRtcDevSwitchNames[] = {
1455 switches::kDisableWebRtcEncryption, 1461 switches::kDisableWebRtcEncryption,
1456 }; 1462 };
1457 command_line->CopySwitchesFrom(browser_command_line, 1463 command_line->CopySwitchesFrom(browser_command_line,
1458 kWebRtcDevSwitchNames, 1464 kWebRtcDevSwitchNames,
1459 arraysize(kWebRtcDevSwitchNames)); 1465 arraysize(kWebRtcDevSwitchNames));
1460 } 1466 }
1461 #endif 1467 #endif
(...skipping 1203 matching lines...) Expand 10 before | Expand all | Expand 10 after
2665 // releases of Chrome. Permitting "Unknown" allows these APIs to be used on 2671 // releases of Chrome. Permitting "Unknown" allows these APIs to be used on
2666 // Chromium builds as well. 2672 // Chromium builds as well.
2667 return channel <= chrome::VersionInfo::CHANNEL_DEV; 2673 return channel <= chrome::VersionInfo::CHANNEL_DEV;
2668 #else 2674 #else
2669 return false; 2675 return false;
2670 #endif 2676 #endif
2671 } 2677 }
2672 2678
2673 2679
2674 } // namespace chrome 2680 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | content/browser/frame_host/render_widget_host_view_guest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698