diff options
| -rw-r--r-- | ash/ash_switches.cc | 3 | ||||
| -rw-r--r-- | ash/ash_switches.h | 1 | ||||
| -rw-r--r-- | ash/wm/session_state_controller_impl2.cc | 38 | ||||
| -rw-r--r-- | chrome/app/chromeos_strings.grdp | 6 | ||||
| -rw-r--r-- | chrome/browser/about_flags.cc | 7 |
5 files changed, 10 insertions, 45 deletions
diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc index 63f5465..5ea8ab6 100644 --- a/ash/ash_switches.cc +++ b/ash/ash_switches.cc @@ -67,9 +67,6 @@ const char kAshLauncherPerDisplay[] = "ash-launcher-per-display"; // If present new lock animations are enabled. const char kAshNewLockAnimationsEnabled[] = "ash-new-lock-animations-enabled"; -// If present animations for lock screen are reversed. -const char kAshReverseNewLockAnimations[] = "ash-reverse-new-lock-animations"; - // Specifies the layout mode and offsets for the secondary display for // testing. The format is "<t|r|b|l>,<offset>" where t=TOP, r=RIGHT, // b=BOTTOM and L=LEFT. For example, 'r,-100' means the secondary display diff --git a/ash/ash_switches.h b/ash/ash_switches.h index 6c0d424..ee4e473 100644 --- a/ash/ash_switches.h +++ b/ash/ash_switches.h @@ -35,7 +35,6 @@ ASH_EXPORT extern const char kAshEnableTrayDragging[]; ASH_EXPORT extern const char kAshImmersive[]; ASH_EXPORT extern const char kAshLauncherPerDisplay[]; ASH_EXPORT extern const char kAshNewLockAnimationsEnabled[]; -ASH_EXPORT extern const char kAshReverseNewLockAnimations[]; ASH_EXPORT extern const char kAshSecondaryDisplayLayout[]; ASH_EXPORT extern const char kAshTouchHud[]; ASH_EXPORT extern const char kAshWindowAnimationsDisabled[]; diff --git a/ash/wm/session_state_controller_impl2.cc b/ash/wm/session_state_controller_impl2.cc index c6456ad..d829b30 100644 --- a/ash/wm/session_state_controller_impl2.cc +++ b/ash/wm/session_state_controller_impl2.cc @@ -71,20 +71,11 @@ void SessionStateControllerImpl2::OnLockStateChanged(bool locked) { base::Callback<void(void)> callback = base::Bind(&SessionStateControllerImpl2::OnLockScreenAnimationFinished, base::Unretained(this)); - if (CommandLine::ForCurrentProcess()-> - HasSwitch(ash::switches::kAshReverseNewLockAnimations)) { - animator_->StartAnimationWithCallback( - internal::SessionStateAnimator::LOCK_SCREEN_CONTAINERS, - internal::SessionStateAnimator::ANIMATION_DROP, - internal::SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS, - callback); - } else { - animator_->StartAnimationWithCallback( - internal::SessionStateAnimator::LOCK_SCREEN_CONTAINERS, - internal::SessionStateAnimator::ANIMATION_RAISE_TO_SCREEN, - internal::SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS, - callback); - } + animator_->StartAnimationWithCallback( + internal::SessionStateAnimator::LOCK_SCREEN_CONTAINERS, + internal::SessionStateAnimator::ANIMATION_RAISE_TO_SCREEN, + internal::SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS, + callback); lock_timer_.Stop(); lock_fail_timer_.Stop(); @@ -325,20 +316,11 @@ void SessionStateControllerImpl2::OnRealShutdownTimeout() { void SessionStateControllerImpl2::OnLockScreenHide( base::Callback<void(void)>& callback) { - if (CommandLine::ForCurrentProcess()-> - HasSwitch(ash::switches::kAshReverseNewLockAnimations)) { - animator_->StartAnimationWithCallback( - internal::SessionStateAnimator::LOCK_SCREEN_CONTAINERS, - internal::SessionStateAnimator::ANIMATION_LIFT, - internal::SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS, - callback); - } else { - animator_->StartAnimationWithCallback( - internal::SessionStateAnimator::LOCK_SCREEN_CONTAINERS, - internal::SessionStateAnimator::ANIMATION_LOWER_BELOW_SCREEN, - internal::SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS, - callback); - } + animator_->StartAnimationWithCallback( + internal::SessionStateAnimator::LOCK_SCREEN_CONTAINERS, + internal::SessionStateAnimator::ANIMATION_LIFT, + internal::SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS, + callback); } } // namespace ash diff --git a/chrome/app/chromeos_strings.grdp b/chrome/app/chromeos_strings.grdp index eee0254..6be2ab8 100644 --- a/chrome/app/chromeos_strings.grdp +++ b/chrome/app/chromeos_strings.grdp @@ -3468,10 +3468,4 @@ Battery full <message name="IDS_LOGIN_MANAGED_REPORTING_HINT" desc="Text for the hint on reporting features displayed in the enterprise notification bar on the login screen."> Device usage may be tracked. </message> - <message name="IDS_FLAGS_ASH_NEW_LOCK_ANIMATIONS_REVERSE" desc="Name for the flag to switch lock animations direction."> - New lock animations direction. - </message> - <message name="IDS_FLAGS_ASH_NEW_LOCK_ANIMATIONS_REVERSE_DESCRIPTION" desc="Description for the flag to switch lock animations direction."> - Changes direction of animation of user pod after lock for new lock animations. - </message> </grit-part> diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index da4d03a..6fe7c90 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -930,13 +930,6 @@ const Experiment kExperiments[] = { SINGLE_VALUE_TYPE(ash::switches::kAshNewLockAnimationsEnabled), }, { - "new-lock-animations-reverse", - IDS_FLAGS_ASH_NEW_LOCK_ANIMATIONS_REVERSE, - IDS_FLAGS_ASH_NEW_LOCK_ANIMATIONS_REVERSE_DESCRIPTION, - kOsCrOS, - SINGLE_VALUE_TYPE(ash::switches::kAshReverseNewLockAnimations), - }, - { "file-manager-packaged", IDS_FLAGS_FILE_MANAGER_PACKAGED_NAME, IDS_FLAGS_FILE_MANAGER_PACKAGED_DESCRIPTION, |