Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(313)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm/lock_state_controller.cc

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/lock_state_controller.h ('k') | ash/wm/lock_state_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/lock_state_controller.cc
diff --git a/ash/wm/lock_state_controller.cc b/ash/wm/lock_state_controller.cc
index 54198ba35ac837d7fdb3c317a27998b2c23219b1..a72ba5ad0c4fd2633b5054f77e66759c603494cf 100644
--- a/ash/wm/lock_state_controller.cc
+++ b/ash/wm/lock_state_controller.cc
@@ -41,7 +41,7 @@ const int kMaxShutdownSoundDurationMs = 1500;
aura::Window* GetBackground() {
aura::Window* root_window = Shell::GetPrimaryRootWindow();
return Shell::GetContainer(root_window,
- internal::kShellWindowId_DesktopBackgroundContainer);
+ kShellWindowId_DesktopBackgroundContainer);
}
bool IsBackgroundHidden() {
@@ -161,7 +161,7 @@ LockStateController::TestApi::~TestApi() {
}
LockStateController::LockStateController()
- : animator_(new internal::SessionStateAnimator()),
+ : animator_(new SessionStateAnimator()),
login_status_(user::LOGGED_IN_NONE),
system_is_locked_(false),
shutting_down_(false),
@@ -251,8 +251,8 @@ void LockStateController::CancelShutdownAnimation() {
}
animator_->StartGlobalAnimation(
- internal::SessionStateAnimator::ANIMATION_UNDO_GRAYSCALE_BRIGHTNESS,
- internal::SessionStateAnimator::ANIMATION_SPEED_REVERT_SHUTDOWN);
+ SessionStateAnimator::ANIMATION_UNDO_GRAYSCALE_BRIGHTNESS,
+ SessionStateAnimator::ANIMATION_SPEED_REVERT_SHUTDOWN);
pre_shutdown_timer_.Stop();
}
@@ -275,8 +275,8 @@ void LockStateController::RequestShutdown() {
shell->cursor_manager()->LockCursor();
animator_->StartGlobalAnimation(
- internal::SessionStateAnimator::ANIMATION_GRAYSCALE_BRIGHTNESS,
- internal::SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN);
+ SessionStateAnimator::ANIMATION_GRAYSCALE_BRIGHTNESS,
+ SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN);
StartRealShutdownTimer(true);
}
@@ -311,10 +311,9 @@ void LockStateController::OnAppTerminating() {
Shell* shell = ash::Shell::GetInstance();
shell->cursor_manager()->HideCursor();
shell->cursor_manager()->LockCursor();
- animator_->StartAnimation(
- internal::SessionStateAnimator::kAllContainersMask,
- internal::SessionStateAnimator::ANIMATION_HIDE_IMMEDIATELY,
- internal::SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE);
+ animator_->StartAnimation(SessionStateAnimator::kAllContainersMask,
+ SessionStateAnimator::ANIMATION_HIDE_IMMEDIATELY,
+ SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE);
}
}
@@ -357,8 +356,7 @@ void LockStateController::StartPreShutdownAnimationTimer() {
pre_shutdown_timer_.Stop();
pre_shutdown_timer_.Start(
FROM_HERE,
- animator_->
- GetDuration(internal::SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN),
+ animator_->GetDuration(SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN),
this,
&LockStateController::OnPreShutdownAnimationTimeout);
}
@@ -377,8 +375,8 @@ void LockStateController::StartRealShutdownTimer(bool with_animation_time) {
base::TimeDelta duration =
base::TimeDelta::FromMilliseconds(kShutdownRequestDelayMs);
if (with_animation_time) {
- duration += animator_->GetDuration(
- internal::SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN);
+ duration +=
+ animator_->GetDuration(SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN);
}
#if defined(OS_CHROMEOS)
@@ -418,8 +416,8 @@ void LockStateController::StartCancellableShutdownAnimation() {
shell->cursor_manager()->HideCursor();
animator_->StartGlobalAnimation(
- internal::SessionStateAnimator::ANIMATION_GRAYSCALE_BRIGHTNESS,
- internal::SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN);
+ SessionStateAnimator::ANIMATION_GRAYSCALE_BRIGHTNESS,
+ SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN);
StartPreShutdownAnimationTimer();
}
@@ -439,23 +437,21 @@ void LockStateController::StartImmediatePreLockAnimation(
observer->Pause();
animator_->StartAnimationWithObserver(
- internal::SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
- internal::SessionStateAnimator::ANIMATION_LIFT,
- internal::SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS,
+ SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
+ SessionStateAnimator::ANIMATION_LIFT,
+ SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS,
observer);
animator_->StartAnimationWithObserver(
- internal::SessionStateAnimator::LAUNCHER,
- internal::SessionStateAnimator::ANIMATION_FADE_OUT,
- internal::SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS,
+ SessionStateAnimator::LAUNCHER,
+ SessionStateAnimator::ANIMATION_FADE_OUT,
+ SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS,
observer);
// Hide the screen locker containers so we can raise them later.
- animator_->StartAnimation(
- internal::SessionStateAnimator::LOCK_SCREEN_CONTAINERS,
- internal::SessionStateAnimator::ANIMATION_HIDE_IMMEDIATELY,
- internal::SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE);
+ animator_->StartAnimation(SessionStateAnimator::LOCK_SCREEN_CONTAINERS,
+ SessionStateAnimator::ANIMATION_HIDE_IMMEDIATELY,
+ SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE);
AnimateBackgroundAppearanceIfNecessary(
- internal::SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS,
- observer);
+ SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS, observer);
observer->Unpause();
@@ -478,23 +474,21 @@ void LockStateController::StartCancellablePreLockAnimation() {
observer->Pause();
animator_->StartAnimationWithObserver(
- internal::SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
- internal::SessionStateAnimator::ANIMATION_LIFT,
- internal::SessionStateAnimator::ANIMATION_SPEED_UNDOABLE,
+ SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
+ SessionStateAnimator::ANIMATION_LIFT,
+ SessionStateAnimator::ANIMATION_SPEED_UNDOABLE,
observer);
animator_->StartAnimationWithObserver(
- internal::SessionStateAnimator::LAUNCHER,
- internal::SessionStateAnimator::ANIMATION_FADE_OUT,
- internal::SessionStateAnimator::ANIMATION_SPEED_UNDOABLE,
+ SessionStateAnimator::LAUNCHER,
+ SessionStateAnimator::ANIMATION_FADE_OUT,
+ SessionStateAnimator::ANIMATION_SPEED_UNDOABLE,
observer);
// Hide the screen locker containers so we can raise them later.
- animator_->StartAnimation(
- internal::SessionStateAnimator::LOCK_SCREEN_CONTAINERS,
- internal::SessionStateAnimator::ANIMATION_HIDE_IMMEDIATELY,
- internal::SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE);
+ animator_->StartAnimation(SessionStateAnimator::LOCK_SCREEN_CONTAINERS,
+ SessionStateAnimator::ANIMATION_HIDE_IMMEDIATELY,
+ SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE);
AnimateBackgroundAppearanceIfNecessary(
- internal::SessionStateAnimator::ANIMATION_SPEED_UNDOABLE,
- observer);
+ SessionStateAnimator::ANIMATION_SPEED_UNDOABLE, observer);
DispatchCancelMode();
FOR_EACH_OBSERVER(LockStateObserver, observers_,
@@ -513,18 +507,17 @@ void LockStateController::CancelPreLockAnimation() {
observer->Pause();
animator_->StartAnimationWithObserver(
- internal::SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
- internal::SessionStateAnimator::ANIMATION_UNDO_LIFT,
- internal::SessionStateAnimator::ANIMATION_SPEED_UNDO_MOVE_WINDOWS,
+ SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
+ SessionStateAnimator::ANIMATION_UNDO_LIFT,
+ SessionStateAnimator::ANIMATION_SPEED_UNDO_MOVE_WINDOWS,
observer);
animator_->StartAnimationWithObserver(
- internal::SessionStateAnimator::LAUNCHER,
- internal::SessionStateAnimator::ANIMATION_FADE_IN,
- internal::SessionStateAnimator::ANIMATION_SPEED_UNDO_MOVE_WINDOWS,
+ SessionStateAnimator::LAUNCHER,
+ SessionStateAnimator::ANIMATION_FADE_IN,
+ SessionStateAnimator::ANIMATION_SPEED_UNDO_MOVE_WINDOWS,
observer);
AnimateBackgroundHidingIfNecessary(
- internal::SessionStateAnimator::ANIMATION_SPEED_UNDO_MOVE_WINDOWS,
- observer);
+ SessionStateAnimator::ANIMATION_SPEED_UNDO_MOVE_WINDOWS, observer);
observer->Unpause();
}
@@ -540,9 +533,9 @@ void LockStateController::StartPostLockAnimation() {
observer->Pause();
animator_->StartAnimationWithObserver(
- internal::SessionStateAnimator::LOCK_SCREEN_CONTAINERS,
- internal::SessionStateAnimator::ANIMATION_RAISE_TO_SCREEN,
- internal::SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS,
+ SessionStateAnimator::LOCK_SCREEN_CONTAINERS,
+ SessionStateAnimator::ANIMATION_RAISE_TO_SCREEN,
+ SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS,
observer);
observer->Unpause();
}
@@ -551,9 +544,9 @@ void LockStateController::StartUnlockAnimationBeforeUIDestroyed(
base::Closure& callback) {
VLOG(1) << "StartUnlockAnimationBeforeUIDestroyed";
animator_->StartAnimationWithCallback(
- internal::SessionStateAnimator::LOCK_SCREEN_CONTAINERS,
- internal::SessionStateAnimator::ANIMATION_LIFT,
- internal::SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS,
+ SessionStateAnimator::LOCK_SCREEN_CONTAINERS,
+ SessionStateAnimator::ANIMATION_LIFT,
+ SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS,
callback);
}
@@ -569,18 +562,17 @@ void LockStateController::StartUnlockAnimationAfterUIDestroyed() {
observer->Pause();
animator_->StartAnimationWithObserver(
- internal::SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
- internal::SessionStateAnimator::ANIMATION_DROP,
- internal::SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS,
+ SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
+ SessionStateAnimator::ANIMATION_DROP,
+ SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS,
observer);
animator_->StartAnimationWithObserver(
- internal::SessionStateAnimator::LAUNCHER,
- internal::SessionStateAnimator::ANIMATION_FADE_IN,
- internal::SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS,
+ SessionStateAnimator::LAUNCHER,
+ SessionStateAnimator::ANIMATION_FADE_IN,
+ SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS,
observer);
AnimateBackgroundHidingIfNecessary(
- internal::SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS,
- observer);
+ SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS, observer);
observer->Unpause();
}
@@ -647,10 +639,9 @@ void LockStateController::StoreUnlockedProperties() {
}
if (unlocked_properties_->background_is_hidden) {
// Hide background so that it can be animated later.
- animator_->StartAnimation(
- internal::SessionStateAnimator::DESKTOP_BACKGROUND,
- internal::SessionStateAnimator::ANIMATION_HIDE_IMMEDIATELY,
- internal::SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE);
+ animator_->StartAnimation(SessionStateAnimator::DESKTOP_BACKGROUND,
+ SessionStateAnimator::ANIMATION_HIDE_IMMEDIATELY,
+ SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE);
ShowBackground();
}
}
@@ -661,35 +652,34 @@ void LockStateController::RestoreUnlockedProperties() {
if (unlocked_properties_->background_is_hidden) {
HideBackground();
// Restore background visibility.
- animator_->StartAnimation(
- internal::SessionStateAnimator::DESKTOP_BACKGROUND,
- internal::SessionStateAnimator::ANIMATION_FADE_IN,
- internal::SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE);
+ animator_->StartAnimation(SessionStateAnimator::DESKTOP_BACKGROUND,
+ SessionStateAnimator::ANIMATION_FADE_IN,
+ SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE);
}
unlocked_properties_.reset();
}
void LockStateController::AnimateBackgroundAppearanceIfNecessary(
- internal::SessionStateAnimator::AnimationSpeed speed,
+ SessionStateAnimator::AnimationSpeed speed,
ui::LayerAnimationObserver* observer) {
if (unlocked_properties_.get() &&
unlocked_properties_->background_is_hidden) {
animator_->StartAnimationWithObserver(
- internal::SessionStateAnimator::DESKTOP_BACKGROUND,
- internal::SessionStateAnimator::ANIMATION_FADE_IN,
+ SessionStateAnimator::DESKTOP_BACKGROUND,
+ SessionStateAnimator::ANIMATION_FADE_IN,
speed,
observer);
}
}
void LockStateController::AnimateBackgroundHidingIfNecessary(
- internal::SessionStateAnimator::AnimationSpeed speed,
+ SessionStateAnimator::AnimationSpeed speed,
ui::LayerAnimationObserver* observer) {
if (unlocked_properties_.get() &&
unlocked_properties_->background_is_hidden) {
animator_->StartAnimationWithObserver(
- internal::SessionStateAnimator::DESKTOP_BACKGROUND,
- internal::SessionStateAnimator::ANIMATION_FADE_OUT,
+ SessionStateAnimator::DESKTOP_BACKGROUND,
+ SessionStateAnimator::ANIMATION_FADE_OUT,
speed,
observer);
}
« no previous file with comments | « ash/wm/lock_state_controller.h ('k') | ash/wm/lock_state_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698