Lock screen for Chrome-Athena

athena/athena.gyp

Index: athena/athena.gyp
diff --git a/athena/athena.gyp b/athena/athena.gyp
index e3bddc3eccffeb97c02003b22bf13590140fde33..140f1b9c493596bcac8d36493d7541d14d9ea59a 100644
--- a/athena/athena.gyp
+++ b/athena/athena.gyp
@@ -81,6 +81,7 @@
         'screen/screen_accelerator_handler.cc',
         'screen/screen_accelerator_handler.h',
         'screen/screen_manager_impl.cc',
+        'screen_lock/public/screen_lock_manager.h',
         'system/background_controller.cc',
         'system/background_controller.h',
         'system/network_selector.cc',
@@ -186,6 +187,7 @@
       'type': 'static_library',
       'dependencies': [
         '../components/components.gyp:component_metrics_proto',
+        '../chrome/chrome.gyp:browser_chromeos',
         '../chrome/chrome.gyp:browser_extensions',
         '../components/components.gyp:omnibox',
       ],
@@ -202,6 +204,7 @@
         'extensions/chrome/chrome_search_controller_factory.cc',
         'extensions/chrome/chrome_search_controller_factory.h',
         'extensions/chrome/extensions_delegate_impl.cc',
+        'screen_lock/chrome/screen_lock_manager_impl.cc',
       ],
     },
     {
@@ -213,6 +216,9 @@
         '../extensions/shell/app_shell.gyp:app_shell_lib',
         '../skia/skia.gyp:skia',
       ],
+      'defines': [
+        'ATHENA_IMPLEMENTATION',

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

I had to add this because of error during athena_main build:

/usr/local/google/home/dpolukhin/chrome/src/third_party/binutils/Linux_x64/Release/bin/ld.gold:
warning: hidden symbol 'athena::ScreenLockManager::Get()' in
obj/athena/libathena_app_shell_lib.a(obj/athena/screen_lock/shell/athena_app_shell_lib.lock_manager_stub.o)
is referenced by DSO lib/libathena_lib.so
/usr/local/google/home/dpolukhin/chrome/src/third_party/binutils/Linux_x64/Release/bin/ld.gold:
error: treating warnings as errors
clang: error: linker command failed with exit code 1 (use -v to see invocation)

[Jun Mukai, 2014/10/14 18:27:25]

I see.  However, I personally prefer not to have this as far as possible.  Can
you follow the way of athena/extensions/extensions_delegate?  It avoids this
linker trouble by the following way:
- Get() and Shutdown() is common, therefore it's in athena_content_lib.  It has
a global pointer of |instance|
- once an instance is created, it will remember itself as global |instance|
- Create...() static method is different among shell/ and chrome/.  In your
case, Create() doing nothing would be fine (therefore |instance| is always NULL
in athena_main)

[oshima, 2014/10/14 19:05:15]

Oh, that is because you have header file in component lib but impl in
static_library. Can you move the header to content_lib ?

[Dmitry Polukhin, 2014/10/15 10:14:26]

I did it and surprisingly it works. I thought that .h files are basically
ignored.

[Dmitry Polukhin, 2014/10/15 12:08:53]

Ooops... I was wrong I forgot to add 'use_athena=1' when I was building. So
there is no magic here, moving header to another build target won't change
anything. As suggested Jun I created ScreenLockManagerBase but I have to put it
into athena_lib to use it from libathena_lib.so. If I put it into
athena_content_lib, linker reports error because libathena_lib.so has referenc
to ScreenLockManager::Get from power_button_controller.cc. I also need export
because Chrome won't be able to use it.

+      ],
       'sources': [
         'content/shell/dialogs.cc',
         'content/shell/media_utils.cc',
@@ -229,6 +235,7 @@
         'extensions/shell/shell_search_controller_factory.h',
         'extensions/shell/url_search_provider.cc',
         'extensions/shell/url_search_provider.h',
+        'screen_lock/shell/lock_manager_stub.cc',
       ],
     },
     {