| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 'build_angle_deqp_tests%': 0, | 6 'build_angle_deqp_tests%': 0, |
| 7 'chrome_browser_extensions_test_support_sources': [ | 7 'chrome_browser_extensions_test_support_sources': [ |
| 8 # A list of sources which is shared between different browser tests. | 8 # A list of sources which is shared between different browser tests. |
| 9 'browser/apps/app_browsertest_util.cc', | 9 'browser/apps/app_browsertest_util.cc', |
| 10 'browser/apps/app_browsertest_util.h', | 10 'browser/apps/app_browsertest_util.h', |
| (...skipping 1710 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1721 # See comment about the same line in chrome/chrome_tests.gypi. | 1721 # See comment about the same line in chrome/chrome_tests.gypi. |
| 1722 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, | 1722 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, |
| 1723 'conditions' : [ | 1723 'conditions' : [ |
| 1724 # The browser window can be views or Cocoa on Mac. Test accordingly. | 1724 # The browser window can be views or Cocoa on Mac. Test accordingly. |
| 1725 ['mac_views_browser==1', { | 1725 ['mac_views_browser==1', { |
| 1726 'sources': [ '<@(chrome_interactive_ui_test_views_non_mac_sources)
' ], | 1726 'sources': [ '<@(chrome_interactive_ui_test_views_non_mac_sources)
' ], |
| 1727 # Following tests needs a refactoring to works with mac_views. | 1727 # Following tests needs a refactoring to works with mac_views. |
| 1728 'sources!': [ | 1728 'sources!': [ |
| 1729 # Aura depended tests. | 1729 # Aura depended tests. |
| 1730 'browser/ui/views/bookmarks/bookmark_bar_view_test.cc', | 1730 'browser/ui/views/bookmarks/bookmark_bar_view_test.cc', |
| 1731 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
', | |
| 1732 ] | 1731 ] |
| 1733 }, { | 1732 }, { |
| 1734 'sources': [ '<@(chrome_interactive_ui_test_cocoa_sources)' ], | 1733 'sources': [ '<@(chrome_interactive_ui_test_cocoa_sources)' ], |
| 1735 }], # mac_views_browser==1 | 1734 }], # mac_views_browser==1 |
| 1736 ], | 1735 ], |
| 1737 }, { # Non-Mac. | 1736 }, { # Non-Mac. |
| 1738 'sources': [ '<@(chrome_interactive_ui_test_views_non_mac_sources)' ], | 1737 'sources': [ '<@(chrome_interactive_ui_test_views_non_mac_sources)' ], |
| 1739 }], | 1738 }], |
| 1740 ['notifications == 1', { | 1739 ['notifications == 1', { |
| 1741 # Common notifications tests. | 1740 # Common notifications tests. |
| (...skipping 1791 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3533 'browser', | 3532 'browser', |
| 3534 ], | 3533 ], |
| 3535 'sources': [ | 3534 'sources': [ |
| 3536 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', | 3535 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', |
| 3537 'tools/service_discovery_sniffer/service_discovery_sniffer.h', | 3536 'tools/service_discovery_sniffer/service_discovery_sniffer.h', |
| 3538 ], | 3537 ], |
| 3539 }] | 3538 }] |
| 3540 }], | 3539 }], |
| 3541 ], # 'conditions' | 3540 ], # 'conditions' |
| 3542 } | 3541 } |
| OLD | NEW |