diff options
| author | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-25 18:37:27 +0000 |
|---|---|---|
| committer | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-25 18:37:27 +0000 |
| commit | 4cdf18813d4d0db204443a623599fa9dcbcdad44 (patch) | |
| tree | db4ae4d7616fc5a29ad58485d604730fd055129e /content/browser/web_contents/touch_editable_impl_aura.cc | |
| parent | 668e9bc40c7e5e3cb477acf62e9ba6ccc0914835 (diff) | |
| download | chromium_src-4cdf18813d4d0db204443a623599fa9dcbcdad44.zip chromium_src-4cdf18813d4d0db204443a623599fa9dcbcdad44.tar.gz chromium_src-4cdf18813d4d0db204443a623599fa9dcbcdad44.tar.bz2 | |
Make touch drag drop and touch editing flags tri-state and turn them on by
default on chromeos.
BUG=115237,168162
Review URL: https://chromiumcodereview.appspot.com/14286004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196446 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/web_contents/touch_editable_impl_aura.cc')
| -rw-r--r-- | content/browser/web_contents/touch_editable_impl_aura.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/content/browser/web_contents/touch_editable_impl_aura.cc b/content/browser/web_contents/touch_editable_impl_aura.cc index d6b3ed9..d782b8c 100644 --- a/content/browser/web_contents/touch_editable_impl_aura.cc +++ b/content/browser/web_contents/touch_editable_impl_aura.cc @@ -4,7 +4,6 @@ #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" @@ -16,7 +15,7 @@ #include "ui/aura/window.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/range/range.h" -#include "ui/base/ui_base_switches.h" +#include "ui/base/ui_base_switches_util.h" namespace content { @@ -29,11 +28,8 @@ TouchEditableImplAura::~TouchEditableImplAura() { // static TouchEditableImplAura* TouchEditableImplAura::Create() { -#if defined(OS_CHROMEOS) - if (CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableTouchEditing)) + if (switches::IsTouchEditingEnabled()) return new TouchEditableImplAura(); -#endif return NULL; } |