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

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: 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 unified diff | Download patch
« no previous file with comments | « no previous file | athena/main/DEPS » ('j') | athena/main/athena_launcher.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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 'resource_manager/delegate/resource_manager_delegate.cc', 73 'resource_manager/delegate/resource_manager_delegate.cc',
74 'resource_manager/memory_pressure_notifier.cc', 74 'resource_manager/memory_pressure_notifier.cc',
75 'resource_manager/memory_pressure_notifier.h', 75 'resource_manager/memory_pressure_notifier.h',
76 'resource_manager/public/resource_manager.h', 76 'resource_manager/public/resource_manager.h',
77 'resource_manager/public/resource_manager_delegate.h', 77 'resource_manager/public/resource_manager_delegate.h',
78 'resource_manager/resource_manager_impl.cc', 78 'resource_manager/resource_manager_impl.cc',
79 'screen/public/screen_manager.h', 79 'screen/public/screen_manager.h',
80 'screen/screen_accelerator_handler.cc', 80 'screen/screen_accelerator_handler.cc',
81 'screen/screen_accelerator_handler.h', 81 'screen/screen_accelerator_handler.h',
82 'screen/screen_manager_impl.cc', 82 'screen/screen_manager_impl.cc',
83 'screen_lock/public/screen_lock_manager.h',
83 'system/background_controller.cc', 84 'system/background_controller.cc',
84 'system/background_controller.h', 85 'system/background_controller.h',
85 'system/network_selector.cc', 86 'system/network_selector.cc',
86 'system/network_selector.h', 87 'system/network_selector.h',
87 'system/orientation_controller.cc', 88 'system/orientation_controller.cc',
88 'system/orientation_controller.h', 89 'system/orientation_controller.h',
89 'system/power_button_controller.cc', 90 'system/power_button_controller.cc',
90 'system/power_button_controller.h', 91 'system/power_button_controller.h',
91 'system/status_icon_container_view.cc', 92 'system/status_icon_container_view.cc',
92 'system/status_icon_container_view.h', 93 'system/status_icon_container_view.h',
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 'extensions/public/extensions_delegate.h', 179 'extensions/public/extensions_delegate.h',
179 'virtual_keyboard/public/virtual_keyboard_manager.h', 180 'virtual_keyboard/public/virtual_keyboard_manager.h',
180 'virtual_keyboard/virtual_keyboard_manager_impl.cc', 181 'virtual_keyboard/virtual_keyboard_manager_impl.cc',
181 ], 182 ],
182 }, 183 },
183 { 184 {
184 'target_name': 'athena_chrome_lib', 185 'target_name': 'athena_chrome_lib',
185 'type': 'static_library', 186 'type': 'static_library',
186 'dependencies': [ 187 'dependencies': [
187 '../components/components.gyp:component_metrics_proto', 188 '../components/components.gyp:component_metrics_proto',
189 '../chrome/chrome.gyp:browser_chromeos',
188 '../chrome/chrome.gyp:browser_extensions', 190 '../chrome/chrome.gyp:browser_extensions',
189 '../components/components.gyp:omnibox', 191 '../components/components.gyp:omnibox',
190 ], 192 ],
193 'defines': [
194 'ATHENA_IMPLEMENTATION',
195 ],
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.
191 'sources': [ 196 'sources': [
192 'content/chrome/dialogs.cc', 197 'content/chrome/dialogs.cc',
193 'content/chrome/media_utils.cc', 198 'content/chrome/media_utils.cc',
194 'content/chrome/scheme_classifier_factory.cc', 199 'content/chrome/scheme_classifier_factory.cc',
195 'content/chrome/web_activity_helpers.cc', 200 'content/chrome/web_activity_helpers.cc',
196 'extensions/chrome/athena_chrome_app_delegate.cc', 201 'extensions/chrome/athena_chrome_app_delegate.cc',
197 'extensions/chrome/athena_chrome_app_delegate.h', 202 'extensions/chrome/athena_chrome_app_delegate.h',
198 'extensions/chrome/athena_chrome_app_window_client.cc', 203 'extensions/chrome/athena_chrome_app_window_client.cc',
199 'extensions/chrome/athena_chrome_app_window_client.h', 204 'extensions/chrome/athena_chrome_app_window_client.h',
200 'extensions/chrome/extensions_delegate_impl.cc', 205 'extensions/chrome/extensions_delegate_impl.cc',
206 'screen_lock/chrome/screen_lock_manager_impl.cc',
201 ], 207 ],
202 }, 208 },
203 { 209 {
204 'target_name': 'athena_app_shell_lib', 210 'target_name': 'athena_app_shell_lib',
205 'type': 'static_library', 211 'type': 'static_library',
206 'dependencies': [ 212 'dependencies': [
207 '../components/components.gyp:component_metrics_proto', 213 '../components/components.gyp:component_metrics_proto',
208 '../components/components.gyp:omnibox', 214 '../components/components.gyp:omnibox',
209 '../extensions/shell/app_shell.gyp:app_shell_lib', 215 '../extensions/shell/app_shell.gyp:app_shell_lib',
210 '../skia/skia.gyp:skia', 216 '../skia/skia.gyp:skia',
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 { 269 {
264 'target_name': 'athena_unittests', 270 'target_name': 'athena_unittests',
265 'type': 'executable', 271 'type': 'executable',
266 'dependencies': [ 272 'dependencies': [
267 '../skia/skia.gyp:skia', 273 '../skia/skia.gyp:skia',
268 '../testing/gtest.gyp:gtest', 274 '../testing/gtest.gyp:gtest',
269 'athena_app_shell_lib', 275 'athena_app_shell_lib',
270 'athena_lib', 276 'athena_lib',
271 'athena_test_support', 277 'athena_test_support',
272 'main/athena_main.gyp:athena_main_lib', 278 'main/athena_main.gyp:athena_main_lib',
279 'main/athena_main.gyp:athena_main_stub_lib',
273 'resources/athena_resources.gyp:athena_pak', 280 'resources/athena_resources.gyp:athena_pak',
274 ], 281 ],
275 'sources': [ 282 'sources': [
276 'activity/activity_manager_unittest.cc', 283 'activity/activity_manager_unittest.cc',
277 'content/app_activity_unittest.cc', 284 'content/app_activity_unittest.cc',
278 'env/athena_env_unittest.cc', 285 'env/athena_env_unittest.cc',
279 'home/athena_start_page_view_unittest.cc', 286 'home/athena_start_page_view_unittest.cc',
280 'home/home_card_gesture_manager_unittest.cc', 287 'home/home_card_gesture_manager_unittest.cc',
281 'home/home_card_unittest.cc', 288 'home/home_card_unittest.cc',
282 'input/accelerator_manager_unittest.cc', 289 'input/accelerator_manager_unittest.cc',
283 'resource_manager/memory_pressure_notifier_unittest.cc', 290 'resource_manager/memory_pressure_notifier_unittest.cc',
284 'resource_manager/resource_manager_unittest.cc', 291 'resource_manager/resource_manager_unittest.cc',
285 'screen/screen_manager_unittest.cc', 292 'screen/screen_manager_unittest.cc',
286 'test/base/athena_unittests.cc', 293 'test/base/athena_unittests.cc',
287 'util/drag_handle_unittest.cc', 294 'util/drag_handle_unittest.cc',
288 'util/fill_layout_manager_unittest.cc', 295 'util/fill_layout_manager_unittest.cc',
289 'wm/split_view_controller_unittest.cc', 296 'wm/split_view_controller_unittest.cc',
290 'wm/window_list_provider_impl_unittest.cc', 297 'wm/window_list_provider_impl_unittest.cc',
291 'wm/window_manager_unittest.cc', 298 'wm/window_manager_unittest.cc',
292 ], 299 ],
293 } 300 }
294 ], 301 ],
295 } 302 }
296 303
OLDNEW
« 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