summaryrefslogtreecommitdiffstats
path: root/ash/ash_switches.cc
diff options
context:
space:
mode:
authordmazzoni@google.com <dmazzoni@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-28 13:28:28 +0000
committerdmazzoni@google.com <dmazzoni@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-28 13:28:28 +0000
commit2e0b235df6b3d4c3ec468ee5c2c0d9887bd568f6 (patch)
treeec39cb2523c2c49acec3f5eba8ed5df356d9cc3c /ash/ash_switches.cc
parentad3314fb636238c5d079eed8f4da246e98bb4394 (diff)
downloadchromium_src-2e0b235df6b3d4c3ec468ee5c2c0d9887bd568f6.zip
chromium_src-2e0b235df6b3d4c3ec468ee5c2c0d9887bd568f6.tar.gz
chromium_src-2e0b235df6b3d4c3ec468ee5c2c0d9887bd568f6.tar.bz2
Revert 285871 "Revert 285867 "Revert 285832 "Disable accessible ..."
> 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 TBR=hajimehoshi@chromium.org Review URL: https://codereview.chromium.org/424773002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285895 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ash_switches.cc')
-rw-r--r--ash/ash_switches.cc11
1 files changed, 6 insertions, 5 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.