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

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

Issue 2547373002: Rename TouchEventAPI to TouchEventFeatureDetection (Closed)
Patch Set: Merge branch 'master' of https://chromium.googlesource.com/chromium/src into rename 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
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 0675ad9e6595220d193c554af7b27aa6500bd6eb..0e80165d72ae40dd26db592606a2288f3ba6bbb1 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -87,7 +87,6 @@
#include "ui/base/clipboard/clipboard.h"
#include "ui/base/touch/touch_device.h"
#include "ui/base/ui_base_switches.h"
-#include "ui/events/event_switches.h"
#include "ui/gfx/animation/animation.h"
#include "ui/gfx/color_space.h"
#include "ui/gfx/image/image_skia.h"
@@ -449,14 +448,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 =

Powered by Google App Engine
This is Rietveld 408576698