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

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: . 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/screensaver_view.h » ('j') | ash/screensaver/screensaver_view.h » ('J')
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',
21 '../net/net.gyp:net', 23 '../net/net.gyp:net',
22 '../skia/skia.gyp:skia', 24 '../skia/skia.gyp:skia',
23 '../third_party/icu/icu.gyp:icui18n', 25 '../third_party/icu/icu.gyp:icui18n',
24 '../third_party/icu/icu.gyp:icuuc', 26 '../third_party/icu/icu.gyp:icuuc',
25 '../ui/aura/aura.gyp:aura', 27 '../ui/aura/aura.gyp:aura',
26 '../ui/base/strings/ui_strings.gyp:ui_strings', 28 '../ui/base/strings/ui_strings.gyp:ui_strings',
27 '../ui/gfx/compositor/compositor.gyp:compositor', 29 '../ui/gfx/compositor/compositor.gyp:compositor',
28 '../ui/oak/oak.gyp:oak', 30 '../ui/oak/oak.gyp:oak',
29 '../ui/ui.gyp:ui', 31 '../ui/ui.gyp:ui',
30 '../ui/ui.gyp:ui_resources', 32 '../ui/ui.gyp:ui_resources',
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 'magnifier/magnification_controller.cc', 106 'magnifier/magnification_controller.cc',
105 'magnifier/magnification_controller.h', 107 'magnifier/magnification_controller.h',
106 'monitor/monitor_controller.cc', 108 'monitor/monitor_controller.cc',
107 'monitor/monitor_controller.h', 109 'monitor/monitor_controller.h',
108 'monitor/multi_monitor_manager.cc', 110 'monitor/multi_monitor_manager.cc',
109 'monitor/multi_monitor_manager.h', 111 'monitor/multi_monitor_manager.h',
110 'monitor/secondary_monitor_view.cc', 112 'monitor/secondary_monitor_view.cc',
111 'monitor/secondary_monitor_view.h', 113 'monitor/secondary_monitor_view.h',
112 'screen_ash.cc', 114 'screen_ash.cc',
113 'screen_ash.h', 115 'screen_ash.h',
116 'screensaver/screensaver_view.cc',
117 'screensaver/screensaver_view.h',
114 'screenshot_delegate.h', 118 'screenshot_delegate.h',
115 'shell.cc', 119 'shell.cc',
116 'shell.h', 120 'shell.h',
117 'shell_context_menu.cc', 121 'shell_context_menu.cc',
118 'shell_context_menu.h', 122 'shell_context_menu.h',
119 'shell_delegate.h', 123 'shell_delegate.h',
120 'shell_factory.h', 124 'shell_factory.h',
121 'shell_window_ids.h', 125 'shell_window_ids.h',
122 'system/audio/audio_observer.h', 126 'system/audio/audio_observer.h',
123 'system/audio/tray_volume.cc', 127 'system/audio/tray_volume.cc',
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 }], 314 }],
311 ], 315 ],
312 }, 316 },
313 { 317 {
314 'target_name': 'aura_shell_unittests', 318 'target_name': 'aura_shell_unittests',
315 'type': 'executable', 319 'type': 'executable',
316 'dependencies': [ 320 'dependencies': [
317 '../base/base.gyp:base', 321 '../base/base.gyp:base',
318 '../base/base.gyp:test_support_base', 322 '../base/base.gyp:test_support_base',
319 '../chrome/chrome_resources.gyp:packed_resources', 323 '../chrome/chrome_resources.gyp:packed_resources',
324 '../content/content.gyp:content',
325 '../content/content.gyp:content_browser',
326 '../content/content.gyp:test_support_content',
327 '../ipc/ipc.gyp:test_support_ipc',
328 '../net/net.gyp:net_test_support',
320 '../build/temp_gyp/googleurl.gyp:googleurl', 329 '../build/temp_gyp/googleurl.gyp:googleurl',
321 '../skia/skia.gyp:skia', 330 '../skia/skia.gyp:skia',
322 '../testing/gtest.gyp:gtest', 331 '../testing/gtest.gyp:gtest',
323 '../third_party/icu/icu.gyp:icui18n', 332 '../third_party/icu/icu.gyp:icui18n',
324 '../third_party/icu/icu.gyp:icuuc', 333 '../third_party/icu/icu.gyp:icuuc',
325 '../ui/aura/aura.gyp:aura', 334 '../ui/aura/aura.gyp:aura',
326 '../ui/aura/aura.gyp:test_support_aura', 335 '../ui/aura/aura.gyp:test_support_aura',
327 '../ui/gfx/compositor/compositor.gyp:compositor', 336 '../ui/gfx/compositor/compositor.gyp:compositor',
328 '../ui/gfx/compositor/compositor.gyp:compositor_test_support', 337 '../ui/gfx/compositor/compositor.gyp:compositor_test_support',
329 '../ui/ui.gyp:gfx_resources', 338 '../ui/ui.gyp:gfx_resources',
(...skipping 12 matching lines...) Expand all
342 'app_list/app_list_unittest.cc', 351 'app_list/app_list_unittest.cc',
343 'dip_unittest.cc', 352 'dip_unittest.cc',
344 'drag_drop/drag_drop_controller_unittest.cc', 353 'drag_drop/drag_drop_controller_unittest.cc',
345 'focus_cycler_unittest.cc', 354 'focus_cycler_unittest.cc',
346 'ime/input_method_event_filter_unittest.cc', 355 'ime/input_method_event_filter_unittest.cc',
347 'launcher/launcher_context_menu_unittest.cc', 356 'launcher/launcher_context_menu_unittest.cc',
348 'launcher/launcher_model_unittest.cc', 357 'launcher/launcher_model_unittest.cc',
349 'launcher/launcher_unittest.cc', 358 'launcher/launcher_unittest.cc',
350 'launcher/launcher_view_unittest.cc', 359 'launcher/launcher_view_unittest.cc',
351 'monitor/multi_monitor_manager_unittest.cc', 360 'monitor/multi_monitor_manager_unittest.cc',
361 'screensaver/screensaver_view_unittest.cc',
362 'screensaver/test_webview.h',
363 'screensaver/test_webview.cc',
352 'shell_unittest.cc', 364 'shell_unittest.cc',
353 'test/ash_test_base.cc', 365 'test/ash_test_base.cc',
354 'test/ash_test_base.h', 366 'test/ash_test_base.h',
355 'test/ash_unittests.cc', 367 'test/ash_unittests.cc',
356 'test/capture_tracking_view.cc', 368 'test/capture_tracking_view.cc',
357 'test/capture_tracking_view.h', 369 'test/capture_tracking_view.h',
358 'test/launcher_view_test_api.cc', 370 'test/launcher_view_test_api.cc',
359 'test/launcher_view_test_api.h', 371 'test/launcher_view_test_api.h',
360 'test/test_activation_delegate.cc', 372 'test/test_activation_delegate.cc',
361 'test/test_activation_delegate.h', 373 'test/test_activation_delegate.h',
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 'shell/cocoa/app-Info.plist', 526 'shell/cocoa/app-Info.plist',
515 ], 527 ],
516 'xcode_settings': { 528 'xcode_settings': {
517 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', 529 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
518 }, 530 },
519 }], 531 }],
520 ], 532 ],
521 }, 533 },
522 ], 534 ],
523 } 535 }
OLDNEW
« no previous file with comments | « no previous file | ash/screensaver/screensaver_view.h » ('j') | ash/screensaver/screensaver_view.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698