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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shell.cc

Issue 2876673002: mojo api for view based lockscreen (Closed)
Patch Set: Add a TODO and rebase Created 3 years, 7 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
« ash/login/lock_screen_controller.cc ('K') | « ash/shell.h ('k') | ash/test/DEPS » ('j') | chrome/browser/chromeos/login/lock/screen_locker.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 2d36d457672a27fa6712ce10fb719013481a9b5a..7dc74b5a649ce0391f99c36cc6da65419e81bf20 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -44,6 +44,7 @@
#include "ash/ime/input_method_event_handler.h"
#include "ash/keyboard/keyboard_ui.h"
#include "ash/laser/laser_pointer_controller.h"
+#include "ash/login/lock_screen_controller.h"
#include "ash/login_status.h"
#include "ash/magnifier/magnification_controller.h"
#include "ash/magnifier/partial_magnification_controller.h"
@@ -565,6 +566,7 @@ Shell::Shell(std::unique_ptr<ShellDelegate> shell_delegate,
base::MakeUnique<KeyboardBrightnessController>()),
locale_notification_controller_(
base::MakeUnique<LocaleNotificationController>()),
+ lock_screen_controller_(base::MakeUnique<LockScreenController>()),
media_controller_(base::MakeUnique<MediaController>()),
new_window_controller_(base::MakeUnique<NewWindowController>()),
session_controller_(base::MakeUnique<SessionController>()),
« ash/login/lock_screen_controller.cc ('K') | « ash/shell.h ('k') | ash/test/DEPS » ('j') | chrome/browser/chromeos/login/lock/screen_locker.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698