From 13ba44ab40273271d94704b910544e06aa933a2f Mon Sep 17 00:00:00 2001 From: "dmazzoni@chromium.org" Date: Sun, 27 Jul 2014 11:20:36 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285832 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/ash_switches.cc | 11 +++++------ ash/ash_switches.h | 2 +- ash/root_window_controller.cc | 4 ++-- .../accessibility/touch_exploration_controller_browsertest.cc | 7 +++++++ 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc index 87ffcc496cbd..2b70427c9fba 100644 --- a/ash/ash_switches.cc +++ b/ash/ash_switches.cc @@ -42,16 +42,15 @@ const char kAshDefaultWallpaperSmall[] = "ash-default-wallpaper-small"; // WorkspaceLayoutManager. const char kAshDisableLockLayoutManager[] = "ash-disable-lock-layout-manager"; -// Disable the Touch Exploration Mode. Touch Exploration Mode will no longer be -// turned on automatically when spoken feedback is enabled when this flag is -// set. -const char kAshDisableTouchExplorationMode[] = - "ash-disable-touch-exploration-mode"; - #if defined(OS_CHROMEOS) // Enables key bindings to scroll magnified screen. const char kAshEnableMagnifierKeyScroller[] = "ash-enable-magnifier-key-scroller"; + +// Enable the Touch Exploration Mode, which will be turned on automatically +// when spoken feedback is enabled. +const char kAshEnableTouchExplorationMode[] = + "ash-enable-touch-exploration-mode"; #endif // Enables text filtering with the keyboard in Overview Mode. diff --git a/ash/ash_switches.h b/ash/ash_switches.h index 6edcdb079ccb..fcad49580de0 100644 --- a/ash/ash_switches.h +++ b/ash/ash_switches.h @@ -25,9 +25,9 @@ ASH_EXPORT extern const char kAshDefaultWallpaperIsOem[]; ASH_EXPORT extern const char kAshDefaultWallpaperLarge[]; ASH_EXPORT extern const char kAshDefaultWallpaperSmall[]; ASH_EXPORT extern const char kAshDisableLockLayoutManager[]; -ASH_EXPORT extern const char kAshDisableTouchExplorationMode[]; #if defined(OS_CHROMEOS) ASH_EXPORT extern const char kAshEnableMagnifierKeyScroller[]; +ASH_EXPORT extern const char kAshEnableTouchExplorationMode[]; #endif ASH_EXPORT extern const char kAshDisableTextFilteringInOverviewMode[]; ASH_EXPORT extern const char kAshEnableSoftwareMirroring[]; diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index 0e07dbe03e94..096297e57295 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 diff --git a/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc b/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc index 0e78b04ce41a..b03c6fe71b72 100644 --- a/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc +++ b/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc @@ -5,8 +5,10 @@ #include "ui/chromeos/touch_exploration_controller.h" #include "ash/accessibility_delegate.h" +#include "ash/ash_switches.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" +#include "base/command_line.h" #include "base/test/simple_test_tick_clock.h" #include "base/time/time.h" #include "chrome/browser/ui/browser.h" @@ -34,6 +36,11 @@ class TouchExplorationTest : public InProcessBrowserTest { virtual ~TouchExplorationTest() {} protected: + virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE { + base::CommandLine::ForCurrentProcess()->AppendSwitch( + ash::switches::kAshEnableTouchExplorationMode); + } + virtual void SetUpOnMainThread() OVERRIDE { // The RenderView for WebContents is created as a result of the // navigation to the New Tab page which is done as part of the test -- 2.11.4.GIT