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

Unified Diff: content/shell/app/shell_main_delegate.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 | « content/renderer/render_view_impl.cc ('k') | content/test/test_blink_web_unit_test_support.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/app/shell_main_delegate.cc
diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc
index d37ca0a03473597504e5f7d6a3d62e5f8a85ddcf..f42bb5deed36a21689c8ce1e7eede2210e2dc23a 100644
--- a/content/shell/app/shell_main_delegate.cc
+++ b/content/shell/app/shell_main_delegate.cc
@@ -41,7 +41,6 @@
#include "ui/base/ui_base_paths.h"
#include "ui/base/ui_base_switches.h"
#include "ui/display/display_switches.h"
-#include "ui/events/event_switches.h"
#include "ui/gl/gl_switches.h"
#include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED.
@@ -174,8 +173,9 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
gl::kGLImplementationOSMesaName);
}
command_line.AppendSwitch(switches::kSkipGpuDataLoading);
- command_line.AppendSwitchASCII(switches::kTouchEvents,
- switches::kTouchEventsEnabled);
+ command_line.AppendSwitchASCII(
+ switches::kTouchEventFeatureDetection,
+ switches::kTouchEventFeatureDetectionEnabled);
if (!command_line.HasSwitch(switches::kForceDeviceScaleFactor))
command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0");
command_line.AppendSwitch(
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | content/test/test_blink_web_unit_test_support.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698