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

Side by Side Diff: views/views.gyp

Issue 8202014: Fixes aura build on windows. Makes all tests use the test compositor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Tweaks Created 9 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 | Annotate | Revision Log
« no previous file with comments | « views/test/views_test_base.h ('k') | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 9
10 'target_defaults': { 10 'target_defaults': {
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 ['include', 'controls/menu/native_menu_views.cc'], 424 ['include', 'controls/menu/native_menu_views.cc'],
425 ['include', 'controls/menu/native_menu_views.h'], 425 ['include', 'controls/menu/native_menu_views.h'],
426 ['include', 'drag_utils_gtk.cc'], 426 ['include', 'drag_utils_gtk.cc'],
427 ['include', 'widget/tooltip_manager_views.cc'], 427 ['include', 'widget/tooltip_manager_views.cc'],
428 ], 428 ],
429 }], 429 }],
430 ['use_aura==1', { 430 ['use_aura==1', {
431 'sources/': [ 431 'sources/': [
432 ['exclude', '_(gtk|x)\\.cc$'], 432 ['exclude', '_(gtk|x)\\.cc$'],
433 ['exclude', '/(gtk|x)_[^/]*\\.cc$'], 433 ['exclude', '/(gtk|x)_[^/]*\\.cc$'],
434 ['exclude', 'controls/menu/menu_2.*'],
435 ], 434 ],
436 'sources!': [ 435 'sources!': [
437 'controls/native_control.cc', 436 'controls/native_control.cc',
438 'controls/native_control.h', 437 'controls/native_control.h',
439 'controls/scrollbar/bitmap_scroll_bar.cc', 438 'controls/scrollbar/bitmap_scroll_bar.cc',
440 'controls/scrollbar/bitmap_scroll_bar.h', 439 'controls/scrollbar/bitmap_scroll_bar.h',
441 'controls/tabbed_pane/tabbed_pane.cc', 440 'controls/tabbed_pane/tabbed_pane.cc',
442 'controls/tabbed_pane/tabbed_pane.h', 441 'controls/tabbed_pane/tabbed_pane.h',
443 'controls/table/group_table_view.cc', 442 'controls/table/group_table_view.cc',
444 'controls/table/group_table_view.h', 443 'controls/table/group_table_view.h',
(...skipping 12 matching lines...) Expand all
457 'widget/child_window_message_processor.h', 456 'widget/child_window_message_processor.h',
458 ], 457 ],
459 'conditions': [ 458 'conditions': [
460 ['OS=="win"', { 459 ['OS=="win"', {
461 'sources/': [ 460 'sources/': [
462 ['include', 'controls/menu/menu_config_win.cc'], 461 ['include', 'controls/menu/menu_config_win.cc'],
463 ['include', 'controls/menu/menu_item_view_win.cc'], 462 ['include', 'controls/menu/menu_item_view_win.cc'],
464 ['include', 'controls/menu/menu_separator_win.cc'], 463 ['include', 'controls/menu/menu_separator_win.cc'],
465 ['include', 'drag_utils_win.cc'], 464 ['include', 'drag_utils_win.cc'],
466 ], 465 ],
466 }, {
467 'sources/': [
468 ['exclude', 'controls/menu/menu_2.*'],
469 ],
467 }], 470 }],
468 ], 471 ],
469 }, { # else: use_aura==1 472 }, { # else: use_aura==1
470 'sources!': [ 473 'sources!': [
471 'drag_utils_linux.cc', 474 'drag_utils_linux.cc',
472 ] 475 ]
473 }], 476 }],
474 ['toolkit_uses_gtk == 1', { 477 ['toolkit_uses_gtk == 1', {
475 'dependencies': [ 478 'dependencies': [
476 '../build/linux/system.gyp:gtk', 479 '../build/linux/system.gyp:gtk',
(...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after
937 'dependencies': [ 940 'dependencies': [
938 '../chrome/chrome.gyp:packed_resources', 941 '../chrome/chrome.gyp:packed_resources',
939 ], 942 ],
940 }], 943 }],
941 ], 944 ],
942 }, 945 },
943 ], 946 ],
944 }], 947 }],
945 ], 948 ],
946 } 949 }
OLDNEW
« no previous file with comments | « views/test/views_test_base.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698