summaryrefslogtreecommitdiffstats
path: root/ash/ash_switches.h
diff options
context:
space:
mode:
authorhajimehoshi@chromium.org <hajimehoshi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-28 06:54:31 +0000
committerhajimehoshi@chromium.org <hajimehoshi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-28 06:54:31 +0000
commit4f4778f834193470ab9cff0c09e13e51416b460e (patch)
treeec45a4d49b9e18f4879ac7fd3e8a88a0fd9995c4 /ash/ash_switches.h
parentf6446bea817c55acfd4e3ee23444c1d2393da9af (diff)
downloadchromium_src-4f4778f834193470ab9cff0c09e13e51416b460e.zip
chromium_src-4f4778f834193470ab9cff0c09e13e51416b460e.tar.gz
chromium_src-4f4778f834193470ab9cff0c09e13e51416b460e.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285871 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ash_switches.h')
-rw-r--r--ash/ash_switches.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/ash_switches.h b/ash/ash_switches.h
index 6edcdb0..fcad495 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[];