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

Unified Diff: athena/athena.gyp

Issue 620663005: Lock screen for Chrome-Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed crash 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 | « no previous file | athena/main/DEPS » ('j') | athena/main/athena_launcher.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/athena.gyp
diff --git a/athena/athena.gyp b/athena/athena.gyp
index 8453bcbb381ebeb02ff299d29ed2313a718ca4a6..2a9cc48f0cb49354d97ea93d90c3fa53182e3bfd 100644
--- a/athena/athena.gyp
+++ b/athena/athena.gyp
@@ -80,6 +80,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',
@@ -185,9 +186,13 @@
'type': 'static_library',
'dependencies': [
'../components/components.gyp:component_metrics_proto',
+ '../chrome/chrome.gyp:browser_chromeos',
'../chrome/chrome.gyp:browser_extensions',
'../components/components.gyp:omnibox',
],
+ 'defines': [
+ 'ATHENA_IMPLEMENTATION',
+ ],
oshima 2014/10/13 18:52:20 this is static library, so you don't need this.
Dmitry Polukhin 2014/10/14 11:20:33 Done.
'sources': [
'content/chrome/dialogs.cc',
'content/chrome/media_utils.cc',
@@ -198,6 +203,7 @@
'extensions/chrome/athena_chrome_app_window_client.cc',
'extensions/chrome/athena_chrome_app_window_client.h',
'extensions/chrome/extensions_delegate_impl.cc',
+ 'screen_lock/chrome/screen_lock_manager_impl.cc',
],
},
{
@@ -270,6 +276,7 @@
'athena_lib',
'athena_test_support',
'main/athena_main.gyp:athena_main_lib',
+ 'main/athena_main.gyp:athena_main_stub_lib',
'resources/athena_resources.gyp:athena_pak',
],
'sources': [
« no previous file with comments | « no previous file | athena/main/DEPS » ('j') | athena/main/athena_launcher.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698