summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvarunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-21 14:57:57 +0000
committervarunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-21 14:57:57 +0000
commitac38a4e4cd797177454038396842fa35e2d949e3 (patch)
tree1e8234c396d970d3b4a27d5dab5bfab90f1e3b00
parent2406dd81a4f19002d3a58a8ca93dbd85a10691ec (diff)
downloadchromium_src-ac38a4e4cd797177454038396842fa35e2d949e3.zip
chromium_src-ac38a4e4cd797177454038396842fa35e2d949e3.tar.gz
chromium_src-ac38a4e4cd797177454038396842fa35e2d949e3.tar.bz2
Revert 205124 "Turn on touch drag and drop and touch editing by ..."
> Turn on touch drag and drop and touch editing by default on chromeos. > > BUG=168162 > > Review URL: https://chromiumcodereview.appspot.com/16268020 TBR=varunjain@chromium.org,sky@chromium.org Review URL: https://codereview.chromium.org/17068008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207820 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--ui/base/ui_base_switches_util.cc10
1 files changed, 0 insertions, 10 deletions
diff --git a/ui/base/ui_base_switches_util.cc b/ui/base/ui_base_switches_util.cc
index 3203421..c541a9b 100644
--- a/ui/base/ui_base_switches_util.cc
+++ b/ui/base/ui_base_switches_util.cc
@@ -10,23 +10,13 @@
namespace switches {
bool IsTouchDragDropEnabled() {
-#if defined(OS_CHROMEOS)
- return !CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableTouchDragDrop);
-#else
return CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableTouchDragDrop);
-#endif
}
bool IsTouchEditingEnabled() {
-#if defined(OS_CHROMEOS)
- return !CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableTouchEditing);
-#else
return CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableTouchEditing);
-#endif
}
bool IsNewDialogStyleEnabled() {