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 /chrome/browser/ui | |
| 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 'chrome/browser/ui')
| -rw-r--r-- | chrome/browser/ui/webui/chromeos/login/oobe_ui.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc index 5604a44..ad59a99 100644 --- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc +++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc @@ -279,10 +279,10 @@ void OobeUI::GetLocalizedStrings(base::DictionaryValue* localized_strings) { localized_strings->SetString("oobeType", "old"); if (CommandLine::ForCurrentProcess()-> - HasSwitch(ash::switches::kAshDisableNewLockAnimations)) - localized_strings->SetString("lockAnimationsType", "old"); - else + HasSwitch(ash::switches::kAshNewLockAnimationsEnabled)) localized_strings->SetString("lockAnimationsType", "new"); + else + localized_strings->SetString("lockAnimationsType", "old"); // If we're not doing boot animation then WebUI should trigger // wallpaper load on boot. |