diff options
author | hajimehoshi@chromium.org <hajimehoshi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-28 06:54:31 +0000 |
---|---|---|
committer | hajimehoshi@chromium.org <hajimehoshi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-28 06:54:31 +0000 |
commit | 4f4778f834193470ab9cff0c09e13e51416b460e (patch) | |
tree | ec45a4d49b9e18f4879ac7fd3e8a88a0fd9995c4 /ash/root_window_controller.cc | |
parent | f6446bea817c55acfd4e3ee23444c1d2393da9af (diff) | |
download | chromium_src-4f4778f834193470ab9cff0c09e13e51416b460e.zip chromium_src-4f4778f834193470ab9cff0c09e13e51416b460e.tar.gz chromium_src-4f4778f834193470ab9cff0c09e13e51416b460e.tar.bz2 |
Revert 285867 "Revert 285832 "Disable accessible touch explorati..."
> Revert 285832 "Disable accessible touch exploration by default."
>
> This change was to disable the feature on M37. Reverting so that
> accessible touch exploration is enabled again on trunk.
>
> > Disable accessible touch exploration by default.
> >
> > Touch exploration was too buggy in M37, we don't want to launch it.
> > The plan is to land this change and merge to M37, then revert it to aim for
> > a launch of touch exploration in M38.
> >
> > BUG=396193
> >
> > Review URL: https://codereview.chromium.org/414493004
>
> TBR=dmazzoni@chromium.org
>
> Review URL: https://codereview.chromium.org/419423003
TBR=dmazzoni@google.com
Review URL: https://codereview.chromium.org/419423004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285871 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_controller.cc')
-rw-r--r-- | ash/root_window_controller.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index 0e07dbe..096297e 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -757,8 +757,8 @@ void RootWindowController::Init(RootWindowType root_window_type, } #if defined(OS_CHROMEOS) - if (!CommandLine::ForCurrentProcess()->HasSwitch( - switches::kAshDisableTouchExplorationMode)) { + if (CommandLine::ForCurrentProcess()->HasSwitch( + switches::kAshEnableTouchExplorationMode)) { touch_exploration_manager_.reset(new AshTouchExplorationManager(this)); } #endif |