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

Unified Diff: chrome/browser/apps/guest_view/web_view_browsertest.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
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/chromeos/login/chrome_restart_request.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/apps/guest_view/web_view_browsertest.cc
diff --git a/chrome/browser/apps/guest_view/web_view_browsertest.cc b/chrome/browser/apps/guest_view/web_view_browsertest.cc
index 341fd4a0ed69aa36e71cfcd151b88903f74ecd18..cf2b44733cec8d9509ae0a8290c486cb5dc0c224 100644
--- a/chrome/browser/apps/guest_view/web_view_browsertest.cc
+++ b/chrome/browser/apps/guest_view/web_view_browsertest.cc
@@ -84,7 +84,6 @@
#include "ui/compositor/compositor.h"
#include "ui/compositor/compositor_observer.h"
#include "ui/display/display_switches.h"
-#include "ui/events/event_switches.h"
#include "ui/events/gesture_detection/gesture_configuration.h"
#include "ui/gl/gl_switches.h"
#include "ui/views/view.h"
@@ -3406,8 +3405,9 @@ class WebViewGuestScrollTouchTest : public WebViewGuestScrollTest {
void SetUpCommandLine(base::CommandLine* command_line) override {
WebViewGuestScrollTest::SetUpCommandLine(command_line);
- command_line->AppendSwitchASCII(switches::kTouchEvents,
- switches::kTouchEventsEnabled);
+ command_line->AppendSwitchASCII(
+ switches::kTouchEventFeatureDetection,
+ switches::kTouchEventFeatureDetectionEnabled);
}
};
@@ -3528,8 +3528,9 @@ class WebViewGuestTouchFocusTest : public WebViewTestBase {
void SetUpCommandLine(base::CommandLine* command_line) override {
WebViewTestBase::SetUpCommandLine(command_line);
- command_line->AppendSwitchASCII(switches::kTouchEvents,
- switches::kTouchEventsEnabled);
+ command_line->AppendSwitchASCII(
+ switches::kTouchEventFeatureDetection,
+ switches::kTouchEventFeatureDetectionEnabled);
}
private:
@@ -3696,8 +3697,9 @@ class WebViewScrollGuestContentTest : public WebViewTest {
void SetUpCommandLine(base::CommandLine* command_line) override {
WebViewTest::SetUpCommandLine(command_line);
- command_line->AppendSwitchASCII(switches::kTouchEvents,
- switches::kTouchEventsEnabled);
+ command_line->AppendSwitchASCII(
+ switches::kTouchEventFeatureDetection,
+ switches::kTouchEventFeatureDetectionEnabled);
}
};
@@ -3772,8 +3774,9 @@ class WebViewFocusTest : public WebViewTest {
void SetUpCommandLine(base::CommandLine* command_line) override {
WebViewTest::SetUpCommandLine(command_line);
- command_line->AppendSwitchASCII(switches::kTouchEvents,
- switches::kTouchEventsEnabled);
+ command_line->AppendSwitchASCII(
+ switches::kTouchEventFeatureDetection,
+ switches::kTouchEventFeatureDetectionEnabled);
}
void ForceCompositorFrame() {
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/chromeos/login/chrome_restart_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698