Chromium Code Reviews| Index: ash/wm/lock_state_controller.h |
| diff --git a/ash/wm/lock_state_controller.h b/ash/wm/lock_state_controller.h |
| index 388558db4ab0302dbb62eb3bdf9ab4a5cbe6cf2c..34d3c309ac548f64770c40ff2d84e0b41c7320ba 100644 |
| --- a/ash/wm/lock_state_controller.h |
| +++ b/ash/wm/lock_state_controller.h |
| @@ -22,19 +22,13 @@ class Rect; |
| class Size; |
| } |
| -namespace service_manager { |
| -class Connector; |
| -} |
| - |
| namespace ui { |
| class Layer; |
| } |
| namespace ash { |
| -namespace mojom { |
| -class ShutdownClient; |
| -} |
| +class ShutdownController; |
| namespace test { |
| class LockStateControllerTest; |
| @@ -89,7 +83,7 @@ class ASH_EXPORT LockStateController : public aura::WindowTreeHostObserver, |
| // the animation time to finish. |
| static const int kShutdownRequestDelayMs; |
| - explicit LockStateController(service_manager::Connector* connector); |
| + explicit LockStateController(ShutdownController* shutdown_controller); |
| ~LockStateController() override; |
| // Starts locking (with slow animation) that can be cancelled. |
| @@ -247,8 +241,8 @@ class ASH_EXPORT LockStateController : public aura::WindowTreeHostObserver, |
| // How long has it been since the request to lock the screen? |
| std::unique_ptr<base::ElapsedTimer> lock_duration_timer_; |
| - // The client that we request to shut down the machine. |
| - std::unique_ptr<mojom::ShutdownClient> shutdown_client_; |
| + // Controller used to trigger the actual shut down. |
|
Daniel Erat
2016/11/14 15:42:41
nit: s/shut down/shutdown/
James Cook
2016/11/14 17:21:39
Done.
|
| + ShutdownController* shutdown_controller_; |
| // Started when we request that the screen be locked. When it fires, we |
| // assume that our request got dropped. |