diff options
| -rw-r--r-- | ash/ash_switches.cc | 11 | ||||
| -rw-r--r-- | ash/ash_switches.h | 2 | ||||
| -rw-r--r-- | ash/root_window_controller.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc | 7 |
4 files changed, 9 insertions, 15 deletions
diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc index 2b70427..87ffcc4 100644 --- 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 index fcad495..6edcdb0 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 096297e..0e07dbe 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::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 index ed22cac..1d0f2aa 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 "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 |