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

Unified Diff: ash/wm/lock_state_controller.h

Issue 2497123002: chromeos: Move device shutdown handling out of chrome into ash (Closed)
Patch Set: rebase Created 4 years, 1 month 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/test/test_shutdown_client.cc ('k') | ash/wm/lock_state_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..73877ed89338fccd58515dc1a97a5e2eae231f43 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 shutdown.
+ ShutdownController* shutdown_controller_;
// Started when we request that the screen be locked. When it fires, we
// assume that our request got dropped.
« no previous file with comments | « ash/test/test_shutdown_client.cc ('k') | ash/wm/lock_state_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698