| OLD | NEW |
| 1 { | 1 { |
| 2 'target_name': 'interactive_ui_tests', | 2 'target_name': 'interactive_ui_tests', |
| 3 'type': 'executable', | 3 'type': 'executable', |
| 4 'msvs_guid': '018D4F38-6272-448F-A864-976DA09F05D0', | 4 'msvs_guid': '018D4F38-6272-448F-A864-976DA09F05D0', |
| 5 'dependencies': [ | 5 'dependencies': [ |
| 6 '<(DEPTH)/chrome/chrome.gyp:chrome', | 6 '<(DEPTH)/chrome/chrome.gyp:chrome', |
| 7 '<(DEPTH)/chrome/chrome.gyp:chrome_resources', | 7 '<(DEPTH)/chrome/chrome.gyp:chrome_resources', |
| 8 '<(DEPTH)/chrome/chrome.gyp:chrome_strings', | 8 '<(DEPTH)/chrome/chrome.gyp:chrome_strings', |
| 9 '<(DEPTH)/chrome/chrome.gyp:debugger', | 9 '<(DEPTH)/chrome/chrome.gyp:debugger', |
| 10 '<(DEPTH)/chrome/chrome.gyp:test_support_common', | 10 '<(DEPTH)/chrome/chrome.gyp:test_support_common', |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 '<(DEPTH)/build/linux/system.gyp:gtk', | 57 '<(DEPTH)/build/linux/system.gyp:gtk', |
| 58 '<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 58 '<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 59 ], | 59 ], |
| 60 }], | 60 }], |
| 61 ['OS=="linux" and toolkit_views==0', { | 61 ['OS=="linux" and toolkit_views==0', { |
| 62 'sources!': [ | 62 'sources!': [ |
| 63 # TODO(port) | 63 # TODO(port) |
| 64 '<(DEPTH)/chrome/browser/views/bookmark_bar_view_test.cc', | 64 '<(DEPTH)/chrome/browser/views/bookmark_bar_view_test.cc', |
| 65 '<(DEPTH)/chrome/browser/views/find_bar_host_interactive_uitest.cc', | 65 '<(DEPTH)/chrome/browser/views/find_bar_host_interactive_uitest.cc', |
| 66 '<(DEPTH)/chrome/browser/views/tabs/tab_dragging_test.cc', | 66 '<(DEPTH)/chrome/browser/views/tabs/tab_dragging_test.cc', |
| 67 '<(DEPTH)/chrome/browser/views/tabs/tab_strip_interactive_uitest.cc', |
| 67 '<(DEPTH)/chrome/test/interactive_ui/npapi_interactive_test.cc', | 68 '<(DEPTH)/chrome/test/interactive_ui/npapi_interactive_test.cc', |
| 68 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.cc', | 69 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.cc', |
| 69 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.h', | 70 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.h', |
| 70 ], | 71 ], |
| 71 }], | 72 }], |
| 72 ['OS=="linux" and toolkit_views==1', { | 73 ['OS=="linux" and toolkit_views==1', { |
| 73 'sources!': [ | 74 'sources!': [ |
| 74 '<(DEPTH)/chrome/browser/gtk/bookmark_bar_gtk_interactive_uitest.cc', | 75 '<(DEPTH)/chrome/browser/gtk/bookmark_bar_gtk_interactive_uitest.cc', |
| 75 '<(DEPTH)/chrome/browser/views/tabs/tab_strip_interactive_uitest.cc', | 76 '<(DEPTH)/chrome/browser/views/tabs/tab_strip_interactive_uitest.cc', |
| 76 # TODO(port) | 77 # TODO(port) |
| 77 '<(DEPTH)/chrome/test/interactive_ui/npapi_interactive_test.cc', | 78 '<(DEPTH)/chrome/test/interactive_ui/npapi_interactive_test.cc', |
| 78 ], | 79 ], |
| 79 }], | 80 }], |
| 80 ['target_arch!="x64" and target_arch!="arm"', { | 81 ['target_arch!="x64" and target_arch!="arm"', { |
| 81 'dependencies': [ | 82 'dependencies': [ |
| 82 # run time dependency | 83 # run time dependency |
| 83 '<(DEPTH)/webkit/webkit.gyp:npapi_test_plugin', | 84 '<(DEPTH)/webkit/webkit.gyp:npapi_test_plugin', |
| 84 ], | 85 ], |
| 85 }], # target_arch | 86 }], # target_arch |
| 86 ['OS=="mac"', { | 87 ['OS=="mac"', { |
| 87 'sources!': [ | 88 'sources!': [ |
| 88 # TODO(port) | 89 # TODO(port) |
| 89 '<(DEPTH)/chrome/browser/autocomplete/autocomplete_edit_view_browsertest
.cc', | 90 '<(DEPTH)/chrome/browser/autocomplete/autocomplete_edit_view_browsertest
.cc', |
| 90 '<(DEPTH)/chrome/browser/browser_focus_uitest.cc', | 91 '<(DEPTH)/chrome/browser/browser_focus_uitest.cc', |
| 91 '<(DEPTH)/chrome/browser/browser_keyevents_browsertest.cc', | 92 '<(DEPTH)/chrome/browser/browser_keyevents_browsertest.cc', |
| 92 '<(DEPTH)/chrome/browser/debugger/devtools_sanity_unittest.cc', | 93 '<(DEPTH)/chrome/browser/debugger/devtools_sanity_unittest.cc', |
| 93 '<(DEPTH)/chrome/browser/views/bookmark_bar_view_test.cc', | 94 '<(DEPTH)/chrome/browser/views/bookmark_bar_view_test.cc', |
| 94 '<(DEPTH)/chrome/browser/views/find_bar_host_interactive_uitest.cc', | 95 '<(DEPTH)/chrome/browser/views/find_bar_host_interactive_uitest.cc', |
| 95 '<(DEPTH)/chrome/browser/views/tabs/tab_dragging_test.cc', | 96 '<(DEPTH)/chrome/browser/views/tabs/tab_dragging_test.cc', |
| 97 '<(DEPTH)/chrome/browser/views/tabs/tab_strip_interactive_uitest.cc', |
| 96 '<(DEPTH)/chrome/test/interactive_ui/npapi_interactive_test.cc', | 98 '<(DEPTH)/chrome/test/interactive_ui/npapi_interactive_test.cc', |
| 97 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.cc', | 99 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.cc', |
| 98 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.h', | 100 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.h', |
| 99 ], | 101 ], |
| 100 }], # OS=="mac" | 102 }], # OS=="mac" |
| 101 ['toolkit_views==1', { | 103 ['toolkit_views==1', { |
| 102 'dependencies': [ | 104 'dependencies': [ |
| 103 '<(DEPTH)/views/views.gyp:views', | 105 '<(DEPTH)/views/views.gyp:views', |
| 104 ], | 106 ], |
| 105 }], | 107 }], |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 'msvs_settings': { | 158 'msvs_settings': { |
| 157 'VCLinkerTool': { | 159 'VCLinkerTool': { |
| 158 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', | 160 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', |
| 159 }, | 161 }, |
| 160 }, | 162 }, |
| 161 }, | 163 }, |
| 162 }, # configurations | 164 }, # configurations |
| 163 }], # OS=="win" | 165 }], # OS=="win" |
| 164 ], # conditions | 166 ], # conditions |
| 165 } | 167 } |
| OLD | NEW |