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

Side by Side Diff: ash/ash.gyp

Issue 10191010: Re-implement the screensaver to use WebView instead of ExtensionDialogHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ut fix. Created 8 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | ash/screensaver/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
9 }, 9 },
10 10
11 'targets': [ 11 'targets': [
12 { 12 {
13 'target_name': 'ash', 13 'target_name': 'ash',
14 'type': '<(component)', 14 'type': '<(component)',
15 'dependencies': [ 15 'dependencies': [
16 'ash_strings.gyp:ash_strings', 16 'ash_strings.gyp:ash_strings',
17 '../base/base.gyp:base', 17 '../base/base.gyp:base',
18 '../base/base.gyp:base_i18n', 18 '../base/base.gyp:base_i18n',
19 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 19 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
20 '../build/temp_gyp/googleurl.gyp:googleurl', 20 '../build/temp_gyp/googleurl.gyp:googleurl',
21 '../content/content.gyp:content',
22 '../content/content.gyp:content_browser',
23 '../ipc/ipc.gyp:ipc',
21 '../net/net.gyp:net', 24 '../net/net.gyp:net',
22 '../skia/skia.gyp:skia', 25 '../skia/skia.gyp:skia',
23 '../third_party/icu/icu.gyp:icui18n', 26 '../third_party/icu/icu.gyp:icui18n',
24 '../third_party/icu/icu.gyp:icuuc', 27 '../third_party/icu/icu.gyp:icuuc',
25 '../ui/aura/aura.gyp:aura', 28 '../ui/aura/aura.gyp:aura',
26 '../ui/base/strings/ui_strings.gyp:ui_strings', 29 '../ui/base/strings/ui_strings.gyp:ui_strings',
27 '../ui/gfx/compositor/compositor.gyp:compositor', 30 '../ui/gfx/compositor/compositor.gyp:compositor',
28 '../ui/oak/oak.gyp:oak', 31 '../ui/oak/oak.gyp:oak',
29 '../ui/ui.gyp:ui', 32 '../ui/ui.gyp:ui',
30 '../ui/ui.gyp:ui_resources', 33 '../ui/ui.gyp:ui_resources',
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 'magnifier/magnification_controller.cc', 107 'magnifier/magnification_controller.cc',
105 'magnifier/magnification_controller.h', 108 'magnifier/magnification_controller.h',
106 'monitor/monitor_controller.cc', 109 'monitor/monitor_controller.cc',
107 'monitor/monitor_controller.h', 110 'monitor/monitor_controller.h',
108 'monitor/multi_monitor_manager.cc', 111 'monitor/multi_monitor_manager.cc',
109 'monitor/multi_monitor_manager.h', 112 'monitor/multi_monitor_manager.h',
110 'monitor/secondary_monitor_view.cc', 113 'monitor/secondary_monitor_view.cc',
111 'monitor/secondary_monitor_view.h', 114 'monitor/secondary_monitor_view.h',
112 'screen_ash.cc', 115 'screen_ash.cc',
113 'screen_ash.h', 116 'screen_ash.h',
117 'screensaver/screensaver_view.cc',
118 'screensaver/screensaver_view.h',
114 'screenshot_delegate.h', 119 'screenshot_delegate.h',
115 'shell.cc', 120 'shell.cc',
116 'shell.h', 121 'shell.h',
117 'shell_context_menu.cc', 122 'shell_context_menu.cc',
118 'shell_context_menu.h', 123 'shell_context_menu.h',
119 'shell_delegate.h', 124 'shell_delegate.h',
120 'shell_factory.h', 125 'shell_factory.h',
121 'shell_window_ids.h', 126 'shell_window_ids.h',
122 'system/audio/audio_observer.h', 127 'system/audio/audio_observer.h',
123 'system/audio/tray_volume.cc', 128 'system/audio/tray_volume.cc',
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 }], 321 }],
317 ], 322 ],
318 }, 323 },
319 { 324 {
320 'target_name': 'aura_shell_unittests', 325 'target_name': 'aura_shell_unittests',
321 'type': 'executable', 326 'type': 'executable',
322 'dependencies': [ 327 'dependencies': [
323 '../base/base.gyp:base', 328 '../base/base.gyp:base',
324 '../base/base.gyp:test_support_base', 329 '../base/base.gyp:test_support_base',
325 '../chrome/chrome_resources.gyp:packed_resources', 330 '../chrome/chrome_resources.gyp:packed_resources',
331 '../content/content.gyp:content_browser',
332 '../content/content.gyp:test_support_content',
326 '../build/temp_gyp/googleurl.gyp:googleurl', 333 '../build/temp_gyp/googleurl.gyp:googleurl',
327 '../skia/skia.gyp:skia', 334 '../skia/skia.gyp:skia',
328 '../testing/gtest.gyp:gtest', 335 '../testing/gtest.gyp:gtest',
329 '../third_party/icu/icu.gyp:icui18n', 336 '../third_party/icu/icu.gyp:icui18n',
330 '../third_party/icu/icu.gyp:icuuc', 337 '../third_party/icu/icu.gyp:icuuc',
331 '../ui/aura/aura.gyp:aura', 338 '../ui/aura/aura.gyp:aura',
332 '../ui/aura/aura.gyp:test_support_aura', 339 '../ui/aura/aura.gyp:test_support_aura',
333 '../ui/gfx/compositor/compositor.gyp:compositor', 340 '../ui/gfx/compositor/compositor.gyp:compositor',
334 '../ui/gfx/compositor/compositor.gyp:compositor_test_support', 341 '../ui/gfx/compositor/compositor.gyp:compositor_test_support',
335 '../ui/ui.gyp:gfx_resources', 342 '../ui/ui.gyp:gfx_resources',
336 '../ui/ui.gyp:ui', 343 '../ui/ui.gyp:ui',
337 '../ui/ui.gyp:ui_resources', 344 '../ui/ui.gyp:ui_resources',
338 '../ui/ui.gyp:ui_resources_standard', 345 '../ui/ui.gyp:ui_resources_standard',
339 '../ui/views/views.gyp:views', 346 '../ui/views/views.gyp:views',
347 '../ui/views/views.gyp:test_support_views',
340 'ash', 348 'ash',
341 ], 349 ],
342 'sources': [ 350 'sources': [
343 '../ui/views/test/test_views_delegate.cc', 351 '../ui/views/test/test_views_delegate.cc',
344 '../ui/views/test/test_views_delegate.h', 352 '../ui/views/test/test_views_delegate.h',
345 'accelerators/accelerator_controller_unittest.cc', 353 'accelerators/accelerator_controller_unittest.cc',
346 'accelerators/accelerator_filter_unittest.cc', 354 'accelerators/accelerator_filter_unittest.cc',
347 'accelerators/accelerator_table_unittest.cc', 355 'accelerators/accelerator_table_unittest.cc',
348 'accelerators/nested_dispatcher_controller_unittest.cc', 356 'accelerators/nested_dispatcher_controller_unittest.cc',
349 'app_list/app_list_unittest.cc', 357 'app_list/app_list_unittest.cc',
350 'dip_unittest.cc', 358 'dip_unittest.cc',
351 'drag_drop/drag_drop_controller_unittest.cc', 359 'drag_drop/drag_drop_controller_unittest.cc',
352 'focus_cycler_unittest.cc', 360 'focus_cycler_unittest.cc',
353 'ime/input_method_event_filter_unittest.cc', 361 'ime/input_method_event_filter_unittest.cc',
354 'launcher/launcher_context_menu_unittest.cc', 362 'launcher/launcher_context_menu_unittest.cc',
355 'launcher/launcher_model_unittest.cc', 363 'launcher/launcher_model_unittest.cc',
356 'launcher/launcher_unittest.cc', 364 'launcher/launcher_unittest.cc',
357 'launcher/launcher_view_unittest.cc', 365 'launcher/launcher_view_unittest.cc',
358 'monitor/multi_monitor_manager_unittest.cc', 366 'monitor/multi_monitor_manager_unittest.cc',
367 'screensaver/screensaver_view_unittest.cc',
359 'shell_unittest.cc', 368 'shell_unittest.cc',
360 'test/ash_test_base.cc', 369 'test/ash_test_base.cc',
361 'test/ash_test_base.h', 370 'test/ash_test_base.h',
362 'test/ash_unittests.cc', 371 'test/ash_unittests.cc',
363 'test/capture_tracking_view.cc', 372 'test/capture_tracking_view.cc',
364 'test/capture_tracking_view.h', 373 'test/capture_tracking_view.h',
365 'test/launcher_view_test_api.cc', 374 'test/launcher_view_test_api.cc',
366 'test/launcher_view_test_api.h', 375 'test/launcher_view_test_api.h',
367 'test/test_activation_delegate.cc', 376 'test/test_activation_delegate.cc',
368 'test/test_activation_delegate.h', 377 'test/test_activation_delegate.h',
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 '../third_party/icu/icu.gyp:icuuc', 459 '../third_party/icu/icu.gyp:icuuc',
451 '../ui/aura/aura.gyp:aura', 460 '../ui/aura/aura.gyp:aura',
452 '../ui/gfx/compositor/compositor.gyp:compositor', 461 '../ui/gfx/compositor/compositor.gyp:compositor',
453 '../ui/gfx/compositor/compositor.gyp:compositor_test_support', 462 '../ui/gfx/compositor/compositor.gyp:compositor_test_support',
454 '../ui/ui.gyp:gfx_resources', 463 '../ui/ui.gyp:gfx_resources',
455 '../ui/ui.gyp:ui', 464 '../ui/ui.gyp:ui',
456 '../ui/ui.gyp:ui_resources', 465 '../ui/ui.gyp:ui_resources',
457 '../ui/ui.gyp:ui_resources_standard', 466 '../ui/ui.gyp:ui_resources_standard',
458 '../ui/views/views.gyp:views', 467 '../ui/views/views.gyp:views',
459 '../ui/views/views.gyp:views_examples_lib', 468 '../ui/views/views.gyp:views_examples_lib',
469 '../ui/views/views.gyp:test_support_views',
460 'ash', 470 'ash',
461 ], 471 ],
462 'sources': [ 472 'sources': [
463 'shell/app_list.cc', 473 'shell/app_list.cc',
464 'shell/bubble.cc', 474 'shell/bubble.cc',
465 'shell/content_client/shell_browser_main_parts.cc', 475 'shell/content_client/shell_browser_main_parts.cc',
466 'shell/content_client/shell_browser_main_parts.h', 476 'shell/content_client/shell_browser_main_parts.h',
467 'shell/content_client/shell_content_browser_client.cc', 477 'shell/content_client/shell_content_browser_client.cc',
468 'shell/content_client/shell_content_browser_client.h', 478 'shell/content_client/shell_content_browser_client.h',
469 'shell/content_client/shell_main_delegate.cc', 479 'shell/content_client/shell_main_delegate.cc',
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 'shell/cocoa/app-Info.plist', 532 'shell/cocoa/app-Info.plist',
523 ], 533 ],
524 'xcode_settings': { 534 'xcode_settings': {
525 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', 535 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
526 }, 536 },
527 }], 537 }],
528 ], 538 ],
529 }, 539 },
530 ], 540 ],
531 } 541 }
OLDNEW
« no previous file with comments | « no previous file | ash/screensaver/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698