diff options
| author | dpolukhin <dpolukhin@chromium.org> | 2014-10-16 04:58:13 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-16 11:58:27 +0000 |
| commit | 5b584d515a38c01b3d9d72d823688b67173c97cf (patch) | |
| tree | 8c6ddc56d30dd9f3f7d0a7b39ef8542612576fb6 /athena/athena.gyp | |
| parent | c2792b84932d3e1aaf6de2ca3040ae8407cd2665 (diff) | |
| download | chromium_src-5b584d515a38c01b3d9d72d823688b67173c97cf.zip chromium_src-5b584d515a38c01b3d9d72d823688b67173c97cf.tar.gz chromium_src-5b584d515a38c01b3d9d72d823688b67173c97cf.tar.bz2 | |
Lock screen for Chrome-Athena
Screen lock activates with keyboard accelerator Ctrl+Shift+L and bower button.
BUG=413926
TEST=manual
Review URL: https://codereview.chromium.org/620663005
Cr-Commit-Position: refs/heads/master@{#299878}
Diffstat (limited to 'athena/athena.gyp')
| -rw-r--r-- | athena/athena.gyp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/athena/athena.gyp b/athena/athena.gyp index ee2f614..4084fb2 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', ], }, { |