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

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

Issue 2773403003: Removed device_supports_touch. (Closed)
Patch Set: Preserved old touch-flag behavior. Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/public/common/common_param_traits_macros.h » ('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 27f9a45fc1c1a884b0473ebf7d8966ece433723b..390bae30139fb0de646eb88faa75598966c17952 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -449,8 +449,6 @@ WebPreferences RenderViewHostImpl::ComputeWebkitPrefs() {
features::kCrossOriginMediaPlaybackRequiresUserGesture);
#endif // defined(OS_ANDROID)
- prefs.device_supports_touch = ui::GetTouchScreensAvailability() ==
- ui::TouchScreensAvailability::ENABLED;
const std::string touch_enabled_switch =
command_line.HasSwitch(switches::kTouchEventFeatureDetection)
? command_line.GetSwitchValueASCII(
@@ -458,7 +456,8 @@ WebPreferences RenderViewHostImpl::ComputeWebkitPrefs() {
: switches::kTouchEventFeatureDetectionAuto;
prefs.touch_event_feature_detection_enabled =
(touch_enabled_switch == switches::kTouchEventFeatureDetectionAuto)
- ? prefs.device_supports_touch
+ ? (ui::GetTouchScreensAvailability() ==
+ ui::TouchScreensAvailability::ENABLED)
: (touch_enabled_switch.empty() ||
touch_enabled_switch ==
switches::kTouchEventFeatureDetectionEnabled);
« no previous file with comments | « no previous file | content/public/common/common_param_traits_macros.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698