diff options
| author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-18 15:44:56 +0000 |
|---|---|---|
| committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-18 15:44:56 +0000 |
| commit | 7ac6c5df616b35d8ffca62652af042898bd89a40 (patch) | |
| tree | c9c48da45714daa450872ff61816e72b85ed1374 /ash/ash_switches.h | |
| parent | 47e8f7332c04e732a0617674f53462f2e1aad424 (diff) | |
| download | chromium_src-7ac6c5df616b35d8ffca62652af042898bd89a40.zip chromium_src-7ac6c5df616b35d8ffca62652af042898bd89a40.tar.gz chromium_src-7ac6c5df616b35d8ffca62652af042898bd89a40.tar.bz2 | |
Revert 173731 - interactive_ui_tests" on "Linux ChromiumOS Tests (dbg)(3)
http://build.chromium.org/p/chromium.chromiumos/buildstatus?builder=Linux%20ChromiumOS%20Tests%20%28dbg%29%283%29&number=18313
> Enable new lock animations by default
>
> BUG=138171, 139461, 162646
> TBR=sky
>
>
> Review URL: https://chromiumcodereview.appspot.com/11595008
TBR=antrim@chromium.org
Review URL: https://codereview.chromium.org/11624018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173734 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ash_switches.h')
| -rw-r--r-- | ash/ash_switches.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/ash_switches.h b/ash/ash_switches.h index 3b756ec..4fd53d5 100644 --- a/ash/ash_switches.h +++ b/ash/ash_switches.h @@ -26,7 +26,6 @@ ASH_EXPORT extern const char kAshDebugShortcuts[]; ASH_EXPORT extern const char kAshDisableAutoWindowPlacement[]; ASH_EXPORT extern const char kAshDisablePanelFitting[]; ASH_EXPORT extern const char kAshDisableBootAnimation2[]; -ASH_EXPORT extern const char kAshDisableNewLockAnimations[]; ASH_EXPORT extern const char kAshEnableAdvancedGestures[]; #if defined(OS_LINUX) ASH_EXPORT extern const char kAshEnableMemoryMonitor[]; @@ -37,6 +36,7 @@ ASH_EXPORT extern const char kAshEnableTrayDragging[]; ASH_EXPORT extern const char kAshEnableWorkspaceScrubbing[]; ASH_EXPORT extern const char kAshImmersive[]; ASH_EXPORT extern const char kAshLauncherPerDisplay[]; +ASH_EXPORT extern const char kAshNewLockAnimationsEnabled[]; ASH_EXPORT extern const char kAshSecondaryDisplayLayout[]; ASH_EXPORT extern const char kAshTouchHud[]; ASH_EXPORT extern const char kAuraLegacyPowerButton[]; |