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

Unified Diff: athena/main/athena_launcher.cc

Issue 620663005: Lock screen for Chrome-Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: one more nit Created 6 years, 2 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 | « athena/main/DEPS ('k') | athena/screen/screen_manager_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/main/athena_launcher.cc
diff --git a/athena/main/athena_launcher.cc b/athena/main/athena_launcher.cc
index 77bf29ea58a157c69a51a9f664bdd6c7f5820e4e..2634489e99b74374b55af2ac24e94d18dca1d2c4 100644
--- a/athena/main/athena_launcher.cc
+++ b/athena/main/athena_launcher.cc
@@ -20,6 +20,7 @@
#include "athena/main/placeholder.h"
#include "athena/resource_manager/public/resource_manager.h"
#include "athena/screen/public/screen_manager.h"
+#include "athena/screen_lock/public/screen_lock_manager.h"
#include "athena/system/public/system_ui.h"
#include "athena/virtual_keyboard/public/virtual_keyboard_manager.h"
#include "athena/wm/public/window_manager.h"
@@ -128,6 +129,7 @@ void CreateVirtualKeyboardWithContext(content::BrowserContext* context) {
}
void StartAthenaSessionWithContext(content::BrowserContext* context) {
+ athena::ScreenLockManager::Create();
athena::ExtensionsDelegate::CreateExtensionsDelegate(context);
StartAthenaSession(
athena::CreateContentActivityFactory(),
@@ -160,6 +162,7 @@ void ShutdownAthena() {
athena::ActivityManager::Shutdown();
athena::HomeCard::Shutdown();
athena::ExtensionsDelegate::Shutdown();
+ athena::ScreenLockManager::Shutdown();
session_started = false;
}
athena::AppRegistry::ShutDown();
« no previous file with comments | « athena/main/DEPS ('k') | athena/screen/screen_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698