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

Unified Diff: trunk/src/content/browser/web_contents/touch_editable_impl_aura.cc

Issue 14439009: Revert 196446 "Make touch drag drop and touch editing flags tri-..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 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
Index: trunk/src/content/browser/web_contents/touch_editable_impl_aura.cc
===================================================================
--- trunk/src/content/browser/web_contents/touch_editable_impl_aura.cc (revision 196476)
+++ trunk/src/content/browser/web_contents/touch_editable_impl_aura.cc (working copy)
@@ -4,6 +4,7 @@
#include "content/browser/web_contents/touch_editable_impl_aura.h"
+#include "base/command_line.h"
#include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_view_aura.h"
#include "content/common/view_messages.h"
@@ -15,7 +16,7 @@
#include "ui/aura/window.h"
#include "ui/base/clipboard/clipboard.h"
#include "ui/base/range/range.h"
-#include "ui/base/ui_base_switches_util.h"
+#include "ui/base/ui_base_switches.h"
namespace content {
@@ -28,8 +29,11 @@
// static
TouchEditableImplAura* TouchEditableImplAura::Create() {
- if (switches::IsTouchEditingEnabled())
+#if defined(OS_CHROMEOS)
+ if (CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableTouchEditing))
return new TouchEditableImplAura();
+#endif
return NULL;
}
« no previous file with comments | « trunk/src/content/browser/renderer_host/render_process_host_impl.cc ('k') | trunk/src/content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698