summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstip@chromium.org <stip@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-29 17:43:35 +0000
committerstip@chromium.org <stip@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-29 17:43:35 +0000
commit334b8fb9f9ba8e32062bd91de2eff22e8398018c (patch)
tree04d2781f397cac889a1e9779d5b464937b8048e1
parent2f04f7724138a79741625a041e93b497df0ab6c9 (diff)
downloadchromium_src-334b8fb9f9ba8e32062bd91de2eff22e8398018c.zip
chromium_src-334b8fb9f9ba8e32062bd91de2eff22e8398018c.tar.gz
chromium_src-334b8fb9f9ba8e32062bd91de2eff22e8398018c.tar.bz2
Revert of aura: Enables --enable-text-input-focus-manager by default. (https://codereview.chromium.org/348033003/)
Reason for revert: Looks like this is breaking https://build.chromium.org/p/chromium.win/builders/Interactive%20Tests%20%28dbg%29/builds/48865 again :( Original issue's description: > aura: Enables --enable-text-input-focus-manager by default. > > This CL enables the experimental text input focus manager by default. > > This is second try. First try http://crrev.com/323983005 was reverted. > Reason for revert: > Suspected of breaking interactive_ui_tests on Win: > http://build.chromium.org/p/chromium.win/builders/Interactive%20Tests%20%28dbg%29/builds/48698 > > BUG=290701 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=280532 TBR=sky@chromium.org,msw@chromium.org,yukishiino@chromium.org NOTREECHECKS=true NOTRY=true BUG=290701 Review URL: https://codereview.chromium.org/358313002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280546 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--ui/base/ui_base_switches_util.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/base/ui_base_switches_util.cc b/ui/base/ui_base_switches_util.cc
index 50e3ac2..ba20e53 100644
--- a/ui/base/ui_base_switches_util.cc
+++ b/ui/base/ui_base_switches_util.cc
@@ -10,8 +10,8 @@
namespace switches {
bool IsTextInputFocusManagerEnabled() {
- return !CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableTextInputFocusManager);
+ return CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableTextInputFocusManager);
}
bool IsTouchDragDropEnabled() {