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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285867 0039d316-1c4b-4281-b951-d872f2087c98
FairyWorld · Jul 28, 2014 · d5cefd6 · d5cefd6
1 parent 7774fe4
commit d5cefd6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc
@@ -42,15 +42,16 @@ 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
@@ -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
@@ -757,8 +757,8 @@ void RootWindowController::Init(RootWindowType root_window_type,
   }
 
 #if defined(OS_CHROMEOS)
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kAshEnableTouchExplorationMode)) {
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kAshDisableTouchExplorationMode)) {
     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
@@ -5,10 +5,8 @@
 #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"
@@ -36,11 +34,6 @@ 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