| 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 1717 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1728 # See comment about the same line in chrome/chrome_tests.gypi. | 1728 # See comment about the same line in chrome/chrome_tests.gypi. |
| 1729 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, | 1729 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, |
| 1730 'conditions' : [ | 1730 'conditions' : [ |
| 1731 # The browser window can be views or Cocoa on Mac. Test accordingly. | 1731 # The browser window can be views or Cocoa on Mac. Test accordingly. |
| 1732 ['mac_views_browser==1', { | 1732 ['mac_views_browser==1', { |
| 1733 'sources': [ '<@(chrome_interactive_ui_test_views_non_mac_sources)
' ], | 1733 'sources': [ '<@(chrome_interactive_ui_test_views_non_mac_sources)
' ], |
| 1734 # Following tests needs a refactoring to works with mac_views. | 1734 # Following tests needs a refactoring to works with mac_views. |
| 1735 'sources!': [ | 1735 'sources!': [ |
| 1736 # Aura depended tests. | 1736 # Aura depended tests. |
| 1737 'browser/ui/views/bookmarks/bookmark_bar_view_test.cc', | 1737 'browser/ui/views/bookmarks/bookmark_bar_view_test.cc', |
| 1738 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
', | |
| 1739 ] | 1738 ] |
| 1740 }, { | 1739 }, { |
| 1741 'sources': [ '<@(chrome_interactive_ui_test_cocoa_sources)' ], | 1740 'sources': [ '<@(chrome_interactive_ui_test_cocoa_sources)' ], |
| 1742 }], # mac_views_browser==1 | 1741 }], # mac_views_browser==1 |
| 1743 ], | 1742 ], |
| 1744 }, { # Non-Mac. | 1743 }, { # Non-Mac. |
| 1745 'sources': [ '<@(chrome_interactive_ui_test_views_non_mac_sources)' ], | 1744 'sources': [ '<@(chrome_interactive_ui_test_views_non_mac_sources)' ], |
| 1746 }], | 1745 }], |
| 1747 ['notifications == 1', { | 1746 ['notifications == 1', { |
| 1748 # Common notifications tests. | 1747 # Common notifications tests. |
| (...skipping 1799 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3548 'browser', | 3547 'browser', |
| 3549 ], | 3548 ], |
| 3550 'sources': [ | 3549 'sources': [ |
| 3551 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', | 3550 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', |
| 3552 'tools/service_discovery_sniffer/service_discovery_sniffer.h', | 3551 'tools/service_discovery_sniffer/service_discovery_sniffer.h', |
| 3553 ], | 3552 ], |
| 3554 }] | 3553 }] |
| 3555 }], | 3554 }], |
| 3556 ], # 'conditions' | 3555 ], # 'conditions' |
| 3557 } | 3556 } |
| OLD | NEW |