Implementation of the Touch Exploration Mode - Part III (enabled by default)

This CL makes Touch Exploration Mode enabled by default. This is dependent on Part I and II:
https://codereview.chromium.org/262483003
https://codereview.chromium.org/261863002

BUG=368828

Review URL: https://codereview.chromium.org/266923003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270216 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 8 insertions, 13 deletions

diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc
index acc29b1..327e7ea 100644
--- a/ash/ash_switches.cc
+++ b/ash/ash_switches.cc
@@ -41,10 +41,11 @@ const char kAshDefaultWallpaperSmall[] = "ash-default-wallpaper-small";
 // Disable ability to dock windows at the desktop edge.
 const char kAshDisableDockedWindows[] = "ash-disable-docked-windows";
 
-// Enable the Touch Exploration Mode. Touch Exploration Mode will be turned on
-// automatically when spoken feedback is enabled when this flag is set.
-const char kAshEnableTouchExplorationMode[] =
-    "ash-enable-touch-exploration-mode";
+// 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.
diff --git a/ash/ash_switches.h b/ash/ash_switches.h
index e1be504..8851510 100644
--- a/ash/ash_switches.h
+++ b/ash/ash_switches.h
@@ -25,7 +25,7 @@ ASH_EXPORT extern const char kAshDefaultWallpaperIsOem[];
 ASH_EXPORT extern const char kAshDefaultWallpaperLarge[];
 ASH_EXPORT extern const char kAshDefaultWallpaperSmall[];
 ASH_EXPORT extern const char kAshDisableDockedWindows[];
-ASH_EXPORT extern const char kAshEnableTouchExplorationMode[];
+ASH_EXPORT extern const char kAshDisableTouchExplorationMode[];
 #if defined(OS_CHROMEOS)
 ASH_EXPORT extern const char kAshEnableMagnifierKeyScroller[];
 #endif
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index 2bcec0c..2c0bb5f 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -798,8 +798,8 @@ void RootWindowController::Init(RootWindowType root_window_type,
   }
 
 #if defined(OS_CHROMEOS)
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kAshEnableTouchExplorationMode)) {
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kAshDisableTouchExplorationMode)) {
     cros_accessibility_observer_.reset(new CrosAccessibilityObserver(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 dd60c17..8ede979 100644
--- 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 "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "ui/aura/test/event_generator.h"
@@ -24,10 +22,6 @@ class TouchExplorationTest : public InProcessBrowserTest {
   TouchExplorationTest() {}
   virtual ~TouchExplorationTest() {}
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-    command_line->AppendSwitch(ash::switches::kAshEnableTouchExplorationMode);
-  }
-
  protected:
   void SwitchTouchExplorationMode(bool on) {
     ash::AccessibilityDelegate* ad =