diff options
| author | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-25 20:27:24 +0000 |
|---|---|---|
| committer | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-25 20:27:24 +0000 |
| commit | 555962b957331aa4810eb5049b8f8f07e2e6378c (patch) | |
| tree | 2962226a779d6e5384ba74265507478b9f191847 /ui/base/ui_base_switches_util.cc | |
| parent | 89dc473469cff2c31b24845af1cb7421e90fc49b (diff) | |
| download | chromium_src-555962b957331aa4810eb5049b8f8f07e2e6378c.zip chromium_src-555962b957331aa4810eb5049b8f8f07e2e6378c.tar.gz chromium_src-555962b957331aa4810eb5049b8f8f07e2e6378c.tar.bz2 | |
Revert 196446 "Make touch drag drop and touch editing flags tri-..."
[Reason for revert: Caused repeatable ASAN failures on ChromiumOS bots,
in the tests WebViewTest.Shim and WebViewTest.NewWindow. The failures
indicated a Heap-Use-After-Free condition in
TouchEditableImplAura::AttachToView]
> 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
TBR=varunjain@chromium.org
Review URL: https://codereview.chromium.org/14439009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196479 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/ui_base_switches_util.cc')
| -rw-r--r-- | ui/base/ui_base_switches_util.cc | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/ui/base/ui_base_switches_util.cc b/ui/base/ui_base_switches_util.cc deleted file mode 100644 index 3089607..0000000 --- a/ui/base/ui_base_switches_util.cc +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "ui/base/ui_base_switches_util.h" - -#include "base/command_line.h" -#include "ui/base/ui_base_switches.h" - -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 -} - -} // namespace switches |