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

Side by Side Diff: ash/ash.gyp

Issue 10377155: Move ui/gfx/resources to ui/base/native_theme/resources Step2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: keep gfx_resources.pak for DumpRenderTree 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 | chrome/chrome_dll.gypi » ('j') | ui/views/views.gyp » ('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
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 '../content/content.gyp:test_support_content', 321 '../content/content.gyp:test_support_content',
322 '../build/temp_gyp/googleurl.gyp:googleurl', 322 '../build/temp_gyp/googleurl.gyp:googleurl',
323 '../skia/skia.gyp:skia', 323 '../skia/skia.gyp:skia',
324 '../testing/gtest.gyp:gtest', 324 '../testing/gtest.gyp:gtest',
325 '../third_party/icu/icu.gyp:icui18n', 325 '../third_party/icu/icu.gyp:icui18n',
326 '../third_party/icu/icu.gyp:icuuc', 326 '../third_party/icu/icu.gyp:icuuc',
327 '../ui/aura/aura.gyp:aura', 327 '../ui/aura/aura.gyp:aura',
328 '../ui/aura/aura.gyp:test_support_aura', 328 '../ui/aura/aura.gyp:test_support_aura',
329 '../ui/compositor/compositor.gyp:compositor', 329 '../ui/compositor/compositor.gyp:compositor',
330 '../ui/compositor/compositor.gyp:compositor_test_support', 330 '../ui/compositor/compositor.gyp:compositor_test_support',
331 '../ui/ui.gyp:gfx_resources', 331 '../ui/ui.gyp:native_theme_resources',
332 '../ui/ui.gyp:ui', 332 '../ui/ui.gyp:ui',
333 '../ui/ui.gyp:ui_resources', 333 '../ui/ui.gyp:ui_resources',
334 '../ui/ui.gyp:ui_resources_standard', 334 '../ui/ui.gyp:ui_resources_standard',
335 '../ui/views/views.gyp:views', 335 '../ui/views/views.gyp:views',
336 '../ui/views/views.gyp:test_support_views', 336 '../ui/views/views.gyp:test_support_views',
337 'ash', 337 'ash',
338 ], 338 ],
339 'sources': [ 339 'sources': [
340 '../ui/views/test/test_views_delegate.cc', 340 '../ui/views/test/test_views_delegate.cc',
341 '../ui/views/test/test_views_delegate.h', 341 '../ui/views/test/test_views_delegate.h',
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 'wm/window_modality_controller_unittest.cc', 393 'wm/window_modality_controller_unittest.cc',
394 'wm/workspace_controller_test_helper.cc', 394 'wm/workspace_controller_test_helper.cc',
395 'wm/workspace_controller_test_helper.h', 395 'wm/workspace_controller_test_helper.h',
396 'wm/workspace/multi_window_resize_controller_unittest.cc', 396 'wm/workspace/multi_window_resize_controller_unittest.cc',
397 'wm/workspace/workspace_event_filter_test_helper.cc', 397 'wm/workspace/workspace_event_filter_test_helper.cc',
398 'wm/workspace/workspace_event_filter_test_helper.h', 398 'wm/workspace/workspace_event_filter_test_helper.h',
399 'wm/workspace/workspace_event_filter_unittest.cc', 399 'wm/workspace/workspace_event_filter_unittest.cc',
400 'wm/workspace/workspace_manager_unittest.cc', 400 'wm/workspace/workspace_manager_unittest.cc',
401 'wm/workspace/workspace_window_resizer_unittest.cc', 401 'wm/workspace/workspace_window_resizer_unittest.cc',
402 402
403 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 403 '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.rc',
404 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 404 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
405 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standa rd.rc', 405 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standa rd.rc',
406 ], 406 ],
407 'conditions': [ 407 'conditions': [
408 ['use_ibus==1', { 408 ['use_ibus==1', {
409 'dependencies': [ 409 'dependencies': [
410 '../build/linux/system.gyp:ibus', 410 '../build/linux/system.gyp:ibus',
411 ], 411 ],
412 }], 412 }],
413 ['OS=="win"', { 413 ['OS=="win"', {
(...skipping 29 matching lines...) Expand all
443 '../chrome/chrome_resources.gyp:packed_resources', 443 '../chrome/chrome_resources.gyp:packed_resources',
444 '../content/content.gyp:content_shell_lib', 444 '../content/content.gyp:content_shell_lib',
445 '../content/content.gyp:content', 445 '../content/content.gyp:content',
446 '../skia/skia.gyp:skia', 446 '../skia/skia.gyp:skia',
447 '../third_party/icu/icu.gyp:icui18n', 447 '../third_party/icu/icu.gyp:icui18n',
448 '../third_party/icu/icu.gyp:icuuc', 448 '../third_party/icu/icu.gyp:icuuc',
449 '../ui/app_list/app_list.gyp:app_list', 449 '../ui/app_list/app_list.gyp:app_list',
450 '../ui/aura/aura.gyp:aura', 450 '../ui/aura/aura.gyp:aura',
451 '../ui/compositor/compositor.gyp:compositor', 451 '../ui/compositor/compositor.gyp:compositor',
452 '../ui/compositor/compositor.gyp:compositor_test_support', 452 '../ui/compositor/compositor.gyp:compositor_test_support',
453 '../ui/ui.gyp:gfx_resources', 453 '../ui/ui.gyp:native_theme_resources',
454 '../ui/ui.gyp:ui', 454 '../ui/ui.gyp:ui',
455 '../ui/ui.gyp:ui_resources', 455 '../ui/ui.gyp:ui_resources',
456 '../ui/ui.gyp:ui_resources_standard', 456 '../ui/ui.gyp:ui_resources_standard',
457 '../ui/views/views.gyp:views', 457 '../ui/views/views.gyp:views',
458 '../ui/views/views.gyp:views_examples_lib', 458 '../ui/views/views.gyp:views_examples_lib',
459 '../ui/views/views.gyp:test_support_views', 459 '../ui/views/views.gyp:test_support_views',
460 'ash', 460 'ash',
461 ], 461 ],
462 'sources': [ 462 'sources': [
463 'shell/app_list.cc', 463 'shell/app_list.cc',
(...skipping 16 matching lines...) Expand all
480 'shell/shell_main_parts.cc', 480 'shell/shell_main_parts.cc',
481 'shell/shell_main_parts.h', 481 'shell/shell_main_parts.h',
482 'shell/shell_main_parts_mac.mm', 482 'shell/shell_main_parts_mac.mm',
483 'shell/toplevel_window.cc', 483 'shell/toplevel_window.cc',
484 'shell/toplevel_window.h', 484 'shell/toplevel_window.h',
485 'shell/widgets.cc', 485 'shell/widgets.cc',
486 'shell/window_type_launcher.cc', 486 'shell/window_type_launcher.cc',
487 'shell/window_type_launcher.h', 487 'shell/window_type_launcher.h',
488 'shell/window_watcher.cc', 488 'shell/window_watcher.cc',
489 'shell/window_watcher.h', 489 'shell/window_watcher.h',
490 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 490 '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.rc',
491 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standa rd.rc', 491 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standa rd.rc',
492 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 492 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
493 '../content/app/startup_helper_win.cc', 493 '../content/app/startup_helper_win.cc',
494 '../ui/views/test/test_views_delegate.cc', 494 '../ui/views/test/test_views_delegate.cc',
495 ], 495 ],
496 'conditions': [ 496 'conditions': [
497 ['OS=="win"', { 497 ['OS=="win"', {
498 'msvs_settings': { 498 'msvs_settings': {
499 'VCLinkerTool': { 499 'VCLinkerTool': {
500 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 500 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
(...skipping 21 matching lines...) Expand all
522 'shell/cocoa/app-Info.plist', 522 'shell/cocoa/app-Info.plist',
523 ], 523 ],
524 'xcode_settings': { 524 'xcode_settings': {
525 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', 525 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
526 }, 526 },
527 }], 527 }],
528 ], 528 ],
529 }, 529 },
530 ], 530 ],
531 } 531 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_dll.gypi » ('j') | ui/views/views.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698