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

Side by Side Diff: ui/views/views.gyp

Issue 10365007: ui: Move compositor/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix DEPS 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 | « ui/views/view_unittest.cc ('k') | ui/views/widget/native_widget_aura.cc » ('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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 }, 7 },
8 8
9 'target_defaults': { 9 'target_defaults': {
10 'conditions': [ 10 'conditions': [
(...skipping 17 matching lines...) Expand all
28 '../../base/base.gyp:base', 28 '../../base/base.gyp:base',
29 '../../base/base.gyp:base_i18n', 29 '../../base/base.gyp:base_i18n',
30 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations', 30 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations',
31 '../../build/temp_gyp/googleurl.gyp:googleurl', 31 '../../build/temp_gyp/googleurl.gyp:googleurl',
32 '../../content/content.gyp:content', 32 '../../content/content.gyp:content',
33 '../../net/net.gyp:net', 33 '../../net/net.gyp:net',
34 '../../skia/skia.gyp:skia', 34 '../../skia/skia.gyp:skia',
35 '../../third_party/icu/icu.gyp:icui18n', 35 '../../third_party/icu/icu.gyp:icui18n',
36 '../../third_party/icu/icu.gyp:icuuc', 36 '../../third_party/icu/icu.gyp:icuuc',
37 '../base/strings/ui_strings.gyp:ui_strings', 37 '../base/strings/ui_strings.gyp:ui_strings',
38 '../gfx/compositor/compositor.gyp:compositor', 38 '../compositor/compositor.gyp:compositor',
39 '../ui.gyp:ui', 39 '../ui.gyp:ui',
40 '../ui.gyp:ui_resources', 40 '../ui.gyp:ui_resources',
41 '../ui.gyp:ui_resources_standard', 41 '../ui.gyp:ui_resources_standard',
42 ], 42 ],
43 'defines': [ 43 'defines': [
44 'VIEWS_IMPLEMENTATION', 44 'VIEWS_IMPLEMENTATION',
45 ], 45 ],
46 'sources': [ 46 'sources': [
47 # All .cc, .h under views, except unittests 47 # All .cc, .h under views, except unittests
48 'accessibility/native_view_accessibility_win.cc', 48 'accessibility/native_view_accessibility_win.cc',
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 # factored out. (for some reason it pulls in a bunch 460 # factored out. (for some reason it pulls in a bunch
461 # unrelated things like v8, sqlite nss...). 461 # unrelated things like v8, sqlite nss...).
462 '../../chrome/chrome_resources.gyp:packed_resources', 462 '../../chrome/chrome_resources.gyp:packed_resources',
463 '../../build/temp_gyp/googleurl.gyp:googleurl', 463 '../../build/temp_gyp/googleurl.gyp:googleurl',
464 '../../skia/skia.gyp:skia', 464 '../../skia/skia.gyp:skia',
465 '../../testing/gmock.gyp:gmock', 465 '../../testing/gmock.gyp:gmock',
466 '../../testing/gtest.gyp:gtest', 466 '../../testing/gtest.gyp:gtest',
467 '../../third_party/icu/icu.gyp:icui18n', 467 '../../third_party/icu/icu.gyp:icui18n',
468 '../../third_party/icu/icu.gyp:icuuc', 468 '../../third_party/icu/icu.gyp:icuuc',
469 '../base/strings/ui_strings.gyp:ui_strings', 469 '../base/strings/ui_strings.gyp:ui_strings',
470 '../gfx/compositor/compositor.gyp:compositor', 470 '../compositor/compositor.gyp:compositor',
471 '../gfx/compositor/compositor.gyp:compositor_test_support', 471 '../compositor/compositor.gyp:compositor_test_support',
472 '../ui.gyp:gfx_resources', 472 '../ui.gyp:gfx_resources',
473 '../ui.gyp:ui', 473 '../ui.gyp:ui',
474 '../ui.gyp:ui_resources', 474 '../ui.gyp:ui_resources',
475 '../ui.gyp:ui_resources_standard', 475 '../ui.gyp:ui_resources_standard',
476 'views', 476 'views',
477 ], 477 ],
478 'include_dirs': [ 478 'include_dirs': [
479 '..', 479 '..',
480 ], 480 ],
481 'sources': [ 481 'sources': [
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
697 'VCLinkerTool': { 697 'VCLinkerTool': {
698 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 698 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
699 }, 699 },
700 }, 700 },
701 'dependencies': [ 701 'dependencies': [
702 '../../sandbox/sandbox.gyp:sandbox', 702 '../../sandbox/sandbox.gyp:sandbox',
703 ], 703 ],
704 }], 704 }],
705 ['use_aura==1', { 705 ['use_aura==1', {
706 'dependencies': [ 706 'dependencies': [
707 '../gfx/compositor/compositor.gyp:compositor', 707 '../compositor/compositor.gyp:compositor',
708 '../gfx/compositor/compositor.gyp:compositor_test_support', 708 '../compositor/compositor.gyp:compositor_test_support',
709 ], 709 ],
710 }], 710 }],
711 ['OS=="win"', { 711 ['OS=="win"', {
712 'sources/': [ 712 'sources/': [
713 # This is needed because the aura rule strips it from the default 713 # This is needed because the aura rule strips it from the default
714 # sources list. 714 # sources list.
715 ['include', '^../../content/app/startup_helper_win.cc'], 715 ['include', '^../../content/app/startup_helper_win.cc'],
716 ], 716 ],
717 }], 717 }],
718 ], 718 ],
719 }, # target_name: views_examples_lib 719 }, # target_name: views_examples_lib
720 ], 720 ],
721 } 721 }
OLDNEW
« no previous file with comments | « ui/views/view_unittest.cc ('k') | ui/views/widget/native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698