summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-02 02:25:21 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-02 02:25:21 +0000
commitc805d2bbf10f3a165eeaff8631fa19a580a96b72 (patch)
tree7757667af5c7214203d28458f51b2e67f1999411 /ui
parent40c21bd2186610e63636f75912752b8b7982f67b (diff)
downloadchromium_src-c805d2bbf10f3a165eeaff8631fa19a580a96b72.zip
chromium_src-c805d2bbf10f3a165eeaff8631fa19a580a96b72.tar.gz
chromium_src-c805d2bbf10f3a165eeaff8631fa19a580a96b72.tar.bz2
Turn on FocusController for desktop-aura.
http://crbug.com/162100 TBR=sky@chromium.org Review URL: https://codereview.chromium.org/12187002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180233 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/views/corewm/corewm_switches.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/views/corewm/corewm_switches.cc b/ui/views/corewm/corewm_switches.cc
index fdeb126..ac0ffab 100644
--- a/ui/views/corewm/corewm_switches.cc
+++ b/ui/views/corewm/corewm_switches.cc
@@ -15,8 +15,8 @@ namespace switches {
const char kDisableFocusController[] = "disable-focus-controller";
// When set uses the FocusController in desktop mode.
-const char kEnableFocusControllerOnDesktop[] =
- "enable-focus-controller-on-desktop";
+const char kDisableFocusControllerOnDesktop[] =
+ "disable-focus-controller-on-desktop";
// If present animations are disabled.
const char kWindowAnimationsDisabled[] =
@@ -30,8 +30,8 @@ bool UseFocusController() {
}
bool UseFocusControllerOnDesktop() {
- return CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableFocusControllerOnDesktop);
+ return !CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableFocusControllerOnDesktop);
}
} // namespace corewm