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

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: 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 | « no previous file | athena/main/DEPS » ('j') | no next file with comments »
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 ee2f614f827aaf073c76d2e71c9b1f1d8d3d82b7..4084fb249a1b4014be5c080ab294d8af6590cfeb 100644
--- a/athena/athena.gyp
+++ b/athena/athena.gyp
@@ -180,6 +180,9 @@
'extensions/pubilc/apps_search_controller_factory.h',
'extensions/public/extension_app_model_builder.h',
'extensions/public/extensions_delegate.h',
+ 'screen_lock/public/screen_lock_manager.h',
+ 'screen_lock/screen_lock_manager_base.cc',
+ 'screen_lock/screen_lock_manager_base.h',
'virtual_keyboard/public/virtual_keyboard_manager.h',
'virtual_keyboard/virtual_keyboard_manager_impl.cc',
],
@@ -189,6 +192,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',
],
@@ -205,6 +209,7 @@
'extensions/chrome/chrome_search_controller_factory.cc',
'extensions/chrome/chrome_search_controller_factory.h',
'extensions/chrome/extensions_delegate_impl.cc',
+ 'screen_lock/chrome/chrome_screen_lock_manager.cc',
],
},
{
@@ -232,6 +237,7 @@
'extensions/shell/shell_search_controller_factory.h',
'extensions/shell/url_search_provider.cc',
'extensions/shell/url_search_provider.h',
+ 'screen_lock/shell/shell_screen_lock_manager.cc',
],
},
{
« no previous file with comments | « no previous file | athena/main/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698