Lock screen for Chrome-Athena

athena/main/athena_launcher.cc

Index: athena/main/athena_launcher.cc
diff --git a/athena/main/athena_launcher.cc b/athena/main/athena_launcher.cc
index e85327fd1a461bb263f7767cae326b868adb2475..a57ef64ee490211e02c218f19a203f143dfa498c 100644
--- a/athena/main/athena_launcher.cc
+++ b/athena/main/athena_launcher.cc
@@ -19,6 +19,7 @@
 #include "athena/main/url_search_provider.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"
@@ -127,6 +128,7 @@ void CreateVirtualKeyboardWithContext(content::BrowserContext* context) {
 }
 
 void StartAthenaSessionWithContext(content::BrowserContext* context) {
+  athena::ScreenLockManager::Create();
   athena::ExtensionsDelegate::CreateExtensionsDelegate(context);
   StartAthenaSession(athena::CreateContentActivityFactory(),
                      new athena::ExtensionAppModelBuilder(context));
@@ -152,6 +154,7 @@ void StartAthenaSession(athena::ActivityFactory* activity_factory,
 
 void ShutdownAthena() {
   if (session_started) {
+    athena::ScreenLockManager::Shutdown();

[oshima, 2014/10/13 18:52:20]

please keep the reverse order of the creation order.

[Dmitry Polukhin, 2014/10/14 11:20:33]

Done.

     athena::ActivityFactory::Shutdown();
     athena::ResourceManager::Shutdown();
     athena::ActivityManager::Shutdown();