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

Side by Side Diff: athena/athena.gyp

Issue 620663005: Lock screen for Chrome-Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments resolved 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 unified diff | Download patch
« no previous file with comments | « no previous file | athena/main/DEPS » ('j') | athena/screen/screen_manager_impl.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 'resource_manager/delegate/resource_manager_delegate.cc', 74 'resource_manager/delegate/resource_manager_delegate.cc',
75 'resource_manager/memory_pressure_notifier.cc', 75 'resource_manager/memory_pressure_notifier.cc',
76 'resource_manager/memory_pressure_notifier.h', 76 'resource_manager/memory_pressure_notifier.h',
77 'resource_manager/public/resource_manager.h', 77 'resource_manager/public/resource_manager.h',
78 'resource_manager/public/resource_manager_delegate.h', 78 'resource_manager/public/resource_manager_delegate.h',
79 'resource_manager/resource_manager_impl.cc', 79 'resource_manager/resource_manager_impl.cc',
80 'screen/public/screen_manager.h', 80 'screen/public/screen_manager.h',
81 'screen/screen_accelerator_handler.cc', 81 'screen/screen_accelerator_handler.cc',
82 'screen/screen_accelerator_handler.h', 82 'screen/screen_accelerator_handler.h',
83 'screen/screen_manager_impl.cc', 83 'screen/screen_manager_impl.cc',
84 'screen_lock/public/screen_lock_manager.h',
84 'system/background_controller.cc', 85 'system/background_controller.cc',
85 'system/background_controller.h', 86 'system/background_controller.h',
86 'system/network_selector.cc', 87 'system/network_selector.cc',
87 'system/network_selector.h', 88 'system/network_selector.h',
88 'system/orientation_controller.cc', 89 'system/orientation_controller.cc',
89 'system/orientation_controller.h', 90 'system/orientation_controller.h',
90 'system/power_button_controller.cc', 91 'system/power_button_controller.cc',
91 'system/power_button_controller.h', 92 'system/power_button_controller.h',
92 'system/status_icon_container_view.cc', 93 'system/status_icon_container_view.cc',
93 'system/status_icon_container_view.h', 94 'system/status_icon_container_view.h',
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 'extensions/public/extensions_delegate.h', 180 'extensions/public/extensions_delegate.h',
180 'virtual_keyboard/public/virtual_keyboard_manager.h', 181 'virtual_keyboard/public/virtual_keyboard_manager.h',
181 'virtual_keyboard/virtual_keyboard_manager_impl.cc', 182 'virtual_keyboard/virtual_keyboard_manager_impl.cc',
182 ], 183 ],
183 }, 184 },
184 { 185 {
185 'target_name': 'athena_chrome_lib', 186 'target_name': 'athena_chrome_lib',
186 'type': 'static_library', 187 'type': 'static_library',
187 'dependencies': [ 188 'dependencies': [
188 '../components/components.gyp:component_metrics_proto', 189 '../components/components.gyp:component_metrics_proto',
190 '../chrome/chrome.gyp:browser_chromeos',
189 '../chrome/chrome.gyp:browser_extensions', 191 '../chrome/chrome.gyp:browser_extensions',
190 '../components/components.gyp:omnibox', 192 '../components/components.gyp:omnibox',
191 ], 193 ],
192 'sources': [ 194 'sources': [
193 'content/chrome/dialogs.cc', 195 'content/chrome/dialogs.cc',
194 'content/chrome/media_utils.cc', 196 'content/chrome/media_utils.cc',
195 'content/chrome/web_activity_helpers.cc', 197 'content/chrome/web_activity_helpers.cc',
196 'extensions/chrome/app_list_controller_delegate_athena.cc', 198 'extensions/chrome/app_list_controller_delegate_athena.cc',
197 'extensions/chrome/app_list_controller_delegate_athena.h', 199 'extensions/chrome/app_list_controller_delegate_athena.h',
198 'extensions/chrome/athena_chrome_app_delegate.cc', 200 'extensions/chrome/athena_chrome_app_delegate.cc',
199 'extensions/chrome/athena_chrome_app_delegate.h', 201 'extensions/chrome/athena_chrome_app_delegate.h',
200 'extensions/chrome/athena_chrome_app_window_client.cc', 202 'extensions/chrome/athena_chrome_app_window_client.cc',
201 'extensions/chrome/athena_chrome_app_window_client.h', 203 'extensions/chrome/athena_chrome_app_window_client.h',
202 'extensions/chrome/chrome_search_controller_factory.cc', 204 'extensions/chrome/chrome_search_controller_factory.cc',
203 'extensions/chrome/chrome_search_controller_factory.h', 205 'extensions/chrome/chrome_search_controller_factory.h',
204 'extensions/chrome/extensions_delegate_impl.cc', 206 'extensions/chrome/extensions_delegate_impl.cc',
207 'screen_lock/chrome/screen_lock_manager_impl.cc',
205 ], 208 ],
206 }, 209 },
207 { 210 {
208 'target_name': 'athena_app_shell_lib', 211 'target_name': 'athena_app_shell_lib',
209 'type': 'static_library', 212 'type': 'static_library',
210 'dependencies': [ 213 'dependencies': [
211 '../components/components.gyp:component_metrics_proto', 214 '../components/components.gyp:component_metrics_proto',
212 '../components/components.gyp:omnibox', 215 '../components/components.gyp:omnibox',
213 '../extensions/shell/app_shell.gyp:app_shell_lib', 216 '../extensions/shell/app_shell.gyp:app_shell_lib',
214 '../skia/skia.gyp:skia', 217 '../skia/skia.gyp:skia',
215 ], 218 ],
219 'defines': [
220 'ATHENA_IMPLEMENTATION',
Dmitry Polukhin 2014/10/14 11:20:34 I had to add this because of error during athena_m
Jun Mukai 2014/10/14 18:27:25 I see. However, I personally prefer not to have t
oshima 2014/10/14 19:05:15 Oh, that is because you have header file in compon
Dmitry Polukhin 2014/10/15 10:14:26 I did it and surprisingly it works. I thought that
Dmitry Polukhin 2014/10/15 12:08:53 Ooops... I was wrong I forgot to add 'use_athena=1
221 ],
216 'sources': [ 222 'sources': [
217 'content/shell/dialogs.cc', 223 'content/shell/dialogs.cc',
218 'content/shell/media_utils.cc', 224 'content/shell/media_utils.cc',
219 'content/shell/web_activity_helpers.cc', 225 'content/shell/web_activity_helpers.cc',
220 'extensions/shell/extensions_delegate_impl.cc', 226 'extensions/shell/extensions_delegate_impl.cc',
221 'extensions/shell/athena_shell_app_delegate.cc', 227 'extensions/shell/athena_shell_app_delegate.cc',
222 'extensions/shell/athena_shell_app_delegate.h', 228 'extensions/shell/athena_shell_app_delegate.h',
223 'extensions/shell/athena_shell_app_window_client.cc', 229 'extensions/shell/athena_shell_app_window_client.cc',
224 'extensions/shell/athena_shell_app_window_client.h', 230 'extensions/shell/athena_shell_app_window_client.h',
225 'extensions/shell/athena_shell_scheme_classifier.cc', 231 'extensions/shell/athena_shell_scheme_classifier.cc',
226 'extensions/shell/athena_shell_scheme_classifier.h', 232 'extensions/shell/athena_shell_scheme_classifier.h',
227 'extensions/shell/athena_apps_client_delegate.h', 233 'extensions/shell/athena_apps_client_delegate.h',
228 'extensions/shell/shell_search_controller_factory.cc', 234 'extensions/shell/shell_search_controller_factory.cc',
229 'extensions/shell/shell_search_controller_factory.h', 235 'extensions/shell/shell_search_controller_factory.h',
230 'extensions/shell/url_search_provider.cc', 236 'extensions/shell/url_search_provider.cc',
231 'extensions/shell/url_search_provider.h', 237 'extensions/shell/url_search_provider.h',
238 'screen_lock/shell/lock_manager_stub.cc',
232 ], 239 ],
233 }, 240 },
234 { 241 {
235 'target_name': 'athena_test_support', 242 'target_name': 'athena_test_support',
236 'type': 'static_library', 243 'type': 'static_library',
237 'dependencies': [ 244 'dependencies': [
238 '../base/base.gyp:test_support_base', 245 '../base/base.gyp:test_support_base',
239 '../chromeos/chromeos.gyp:chromeos', 246 '../chromeos/chromeos.gyp:chromeos',
240 '../skia/skia.gyp:skia', 247 '../skia/skia.gyp:skia',
241 '../testing/gtest.gyp:gtest', 248 '../testing/gtest.gyp:gtest',
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 'util/drag_handle_unittest.cc', 303 'util/drag_handle_unittest.cc',
297 'util/fill_layout_manager_unittest.cc', 304 'util/fill_layout_manager_unittest.cc',
298 'wm/split_view_controller_unittest.cc', 305 'wm/split_view_controller_unittest.cc',
299 'wm/window_list_provider_impl_unittest.cc', 306 'wm/window_list_provider_impl_unittest.cc',
300 'wm/window_manager_unittest.cc', 307 'wm/window_manager_unittest.cc',
301 ], 308 ],
302 } 309 }
303 ], 310 ],
304 } 311 }
305 312
OLDNEW
« no previous file with comments | « no previous file | athena/main/DEPS » ('j') | athena/screen/screen_manager_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698