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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 2547373002: Rename TouchEventAPI to TouchEventFeatureDetection (Closed)
Patch Set: Added a todo Created 4 years 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 side-by-side diff with in-line comments
Download patch
« chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc ('K') | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/browser/web_contents/web_contents_view_aura_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_view_host_impl.cc
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index da25e25dba061bf6d295ac506f2598c0685f23fc..2e8dd7bc17ac496ac7744e35e61a76bdecd9fbd9 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -445,14 +445,16 @@ WebPreferences RenderViewHostImpl::ComputeWebkitPrefs() {
prefs.device_supports_touch = ui::GetTouchScreensAvailability() ==
ui::TouchScreensAvailability::ENABLED;
const std::string touch_enabled_switch =
- command_line.HasSwitch(switches::kTouchEvents)
- ? command_line.GetSwitchValueASCII(switches::kTouchEvents)
- : switches::kTouchEventsAuto;
- prefs.touch_event_api_enabled =
- (touch_enabled_switch == switches::kTouchEventsAuto)
+ command_line.HasSwitch(switches::kTouchEventFeatureDetection)
+ ? command_line.GetSwitchValueASCII(
+ switches::kTouchEventFeatureDetection)
+ : switches::kTouchEventFeatureDetectionAuto;
+ prefs.touch_event_feature_detection_enabled =
+ (touch_enabled_switch == switches::kTouchEventFeatureDetectionAuto)
? prefs.device_supports_touch
: (touch_enabled_switch.empty() ||
- touch_enabled_switch == switches::kTouchEventsEnabled);
+ touch_enabled_switch ==
+ switches::kTouchEventFeatureDetectionEnabled);
std::tie(prefs.available_pointer_types, prefs.available_hover_types) =
ui::GetAvailablePointerAndHoverTypes();
prefs.primary_pointer_type =
« chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc ('K') | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/browser/web_contents/web_contents_view_aura_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698