diff options
| author | antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-18 18:43:14 +0000 |
|---|---|---|
| committer | antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-18 18:43:14 +0000 |
| commit | c11aa8f1039b0a1ea7981be53a04f7648604ce8e (patch) | |
| tree | de3f1eb3881eb6a74287d267f0987fd93fad63a5 /ash/shell.cc | |
| parent | f8a5272d1c796aad53cf15f61b9da77489ff22ac (diff) | |
| download | chromium_src-c11aa8f1039b0a1ea7981be53a04f7648604ce8e.zip chromium_src-c11aa8f1039b0a1ea7981be53a04f7648604ce8e.tar.gz chromium_src-c11aa8f1039b0a1ea7981be53a04f7648604ce8e.tar.bz2 | |
Enable new lock animations by default
BUG=138171, 139461, 162646
TBR=sky
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=173731
Review URL: https://chromiumcodereview.appspot.com/11595008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173760 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 0326a26..7e95abf 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -476,10 +476,10 @@ void Shell::Init() { CommandLine* command_line = CommandLine::ForCurrentProcess(); - if (command_line->HasSwitch(ash::switches::kAshNewLockAnimationsEnabled)) - session_state_controller_.reset(new SessionStateControllerImpl2); - else + if (command_line->HasSwitch(ash::switches::kAshDisableNewLockAnimations)) session_state_controller_.reset(new SessionStateControllerImpl); + else + session_state_controller_.reset(new SessionStateControllerImpl2); power_button_controller_.reset(new PowerButtonController( session_state_controller_.get())); AddShellObserver(session_state_controller_.get()); |