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

Unified Diff: ash/wm/lock_state_controller.cc

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: cleanup Created 3 years, 8 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
Index: ash/wm/lock_state_controller.cc
diff --git a/ash/wm/lock_state_controller.cc b/ash/wm/lock_state_controller.cc
index 6ac3e3c4f849949a3bec6dd8fe9dbb1200e56e3e..7b342898492c77ec5b3db38cd0da2b673bf9e111 100644
--- a/ash/wm/lock_state_controller.cc
+++ b/ash/wm/lock_state_controller.cc
@@ -14,10 +14,10 @@
#include "ash/public/interfaces/shutdown.mojom.h"
#include "ash/shell.h"
#include "ash/shell_delegate.h"
+#include "ash/shell_port.h"
#include "ash/shutdown_controller.h"
#include "ash/wm/session_state_animator.h"
#include "ash/wm/session_state_animator_impl.h"
-#include "ash/wm_shell.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/command_line.h"
@@ -299,7 +299,7 @@ void LockStateController::StartRealShutdownTimer(bool with_animation_time) {
void LockStateController::OnRealPowerTimeout() {
VLOG(1) << "OnRealPowerTimeout";
DCHECK(shutting_down_);
- WmShell::Get()->RecordUserMetricsAction(UMA_ACCEL_SHUT_DOWN_POWER_BUTTON);
+ ShellPort::Get()->RecordUserMetricsAction(UMA_ACCEL_SHUT_DOWN_POWER_BUTTON);
// Shut down or reboot based on device policy.
shutdown_controller_->ShutDownOrReboot();
}
@@ -346,7 +346,7 @@ void LockStateController::StartImmediatePreLockAnimation(
animation_sequence->EndSequence();
DispatchCancelMode();
- WmShell::Get()->OnLockStateEvent(
+ ShellPort::Get()->OnLockStateEvent(
LockStateObserver::EVENT_LOCK_ANIMATION_STARTED);
}
@@ -375,7 +375,7 @@ void LockStateController::StartCancellablePreLockAnimation() {
SessionStateAnimator::ANIMATION_SPEED_UNDOABLE, animation_sequence);
DispatchCancelMode();
- WmShell::Get()->OnLockStateEvent(
+ ShellPort::Get()->OnLockStateEvent(
LockStateObserver::EVENT_PRELOCK_ANIMATION_STARTED);
animation_sequence->EndSequence();
}
@@ -464,7 +464,7 @@ void LockStateController::PreLockAnimationFinished(bool request_lock) {
}
if (request_lock) {
- WmShell::Get()->RecordUserMetricsAction(
+ ShellPort::Get()->RecordUserMetricsAction(
shutdown_after_lock_ ? UMA_ACCEL_LOCK_SCREEN_POWER_BUTTON
: UMA_ACCEL_LOCK_SCREEN_LOCK_BUTTON);
chromeos::DBusThreadManager::Get()
@@ -494,7 +494,7 @@ void LockStateController::PreLockAnimationFinished(bool request_lock) {
void LockStateController::PostLockAnimationFinished() {
animating_lock_ = false;
VLOG(1) << "PostLockAnimationFinished";
- WmShell::Get()->OnLockStateEvent(
+ ShellPort::Get()->OnLockStateEvent(
LockStateObserver::EVENT_LOCK_ANIMATION_FINISHED);
if (!lock_screen_displayed_callback_.is_null()) {
lock_screen_displayed_callback_.Run();

Powered by Google App Engine
This is Rietveld 408576698