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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 2822010: Fixes bug in bookmark bar view if profile changed. If the profile (Closed)
Patch Set: Created 10 years, 6 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
OLDNEW
1 # Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 'browser_tests_sources_views_specific': [ 7 'browser_tests_sources_views_specific': [
8 'browser/extensions/browser_action_test_util_views.cc', 8 'browser/extensions/browser_action_test_util_views.cc',
9 'browser/views/browser_actions_container_browsertest.cc', 9 'browser/views/browser_actions_container_browsertest.cc',
10 ], 10 ],
(...skipping 947 matching lines...) Expand 10 before | Expand all | Expand 10 after
958 'browser/tab_menu_model_unittest.cc', 958 'browser/tab_menu_model_unittest.cc',
959 'browser/tabs/pinned_tab_codec_unittest.cc', 959 'browser/tabs/pinned_tab_codec_unittest.cc',
960 'browser/tabs/tab_strip_model_unittest.cc', 960 'browser/tabs/tab_strip_model_unittest.cc',
961 'browser/task_manager_unittest.cc', 961 'browser/task_manager_unittest.cc',
962 'browser/theme_resources_util_unittest.cc', 962 'browser/theme_resources_util_unittest.cc',
963 'browser/thumbnail_store_unittest.cc', 963 'browser/thumbnail_store_unittest.cc',
964 'browser/translate/translate_manager_unittest.cc', 964 'browser/translate/translate_manager_unittest.cc',
965 'browser/translate/translate_manager2_unittest.cc', 965 'browser/translate/translate_manager2_unittest.cc',
966 'browser/user_style_sheet_watcher_unittest.cc', 966 'browser/user_style_sheet_watcher_unittest.cc',
967 'browser/views/accessibility_event_router_views_unittest.cc', 967 'browser/views/accessibility_event_router_views_unittest.cc',
968 'browser/views/bookmark_bar_view_unittest.cc',
968 'browser/views/bookmark_context_menu_test.cc', 969 'browser/views/bookmark_context_menu_test.cc',
969 'browser/views/bookmark_editor_view_unittest.cc', 970 'browser/views/bookmark_editor_view_unittest.cc',
970 'browser/views/extensions/browser_action_drag_data_unittest.cc', 971 'browser/views/extensions/browser_action_drag_data_unittest.cc',
971 'browser/views/generic_info_view_unittest.cc', 972 'browser/views/generic_info_view_unittest.cc',
972 'browser/views/info_bubble_unittest.cc', 973 'browser/views/info_bubble_unittest.cc',
973 'browser/views/status_icons/status_tray_win_unittest.cc', 974 'browser/views/status_icons/status_tray_win_unittest.cc',
974 'browser/visitedlink_unittest.cc', 975 'browser/visitedlink_unittest.cc',
975 'browser/webdata/web_data_service_test_util.h', 976 'browser/webdata/web_data_service_test_util.h',
976 'browser/webdata/web_data_service_unittest.cc', 977 'browser/webdata/web_data_service_unittest.cc',
977 'browser/webdata/web_database_unittest.cc', 978 'browser/webdata/web_database_unittest.cc',
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
1082 ], 1083 ],
1083 'dependencies': [ 1084 'dependencies': [
1084 '../build/linux/system.gyp:gtk', 1085 '../build/linux/system.gyp:gtk',
1085 '../build/linux/system.gyp:nss', 1086 '../build/linux/system.gyp:nss',
1086 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1087 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1087 ], 1088 ],
1088 'sources': [ 1089 'sources': [
1089 'browser/renderer_host/gtk_key_bindings_handler_unittest.cc', 1090 'browser/renderer_host/gtk_key_bindings_handler_unittest.cc',
1090 ], 1091 ],
1091 'sources!': [ 1092 'sources!': [
1093 'browser/views/bookmark_bar_view_unittest.cc',
1092 'browser/views/bookmark_context_menu_test.cc', 1094 'browser/views/bookmark_context_menu_test.cc',
1093 ], 1095 ],
1094 }], 1096 }],
1095 ['toolkit_views==1', { 1097 ['toolkit_views==1', {
1096 'dependencies': [ 1098 'dependencies': [
1097 '../views/views.gyp:views', 1099 '../views/views.gyp:views',
1098 ], 1100 ],
1099 }], 1101 }],
1100 ['OS=="linux" and toolkit_views==1', { 1102 ['OS=="linux" and toolkit_views==1', {
1101 'sources': [ 1103 'sources': [
1102 '<@(views_unit_tests_sources)', 1104 '<@(views_unit_tests_sources)',
1103 '../views/focus/accelerator_handler_gtk_unittest.cc', 1105 '../views/focus/accelerator_handler_gtk_unittest.cc',
1104 ], 1106 ],
1105 # We must use 'sources/' instead of 'source!' as there is a 1107 # We must use 'sources/' instead of 'source!' as there is a
1106 # target-default 'sources/' including gtk_unittest and 'source/' takes 1108 # target-default 'sources/' including gtk_unittest and 'source/' takes
1107 # precedence over 'sources!'. 1109 # precedence over 'sources!'.
1108 'sources/': [ 1110 'sources/': [
1109 ['exclude', 'browser/gtk/bookmark_bar_gtk_unittest\\.cc$'], 1111 ['exclude', 'browser/gtk/bookmark_bar_gtk_unittest\\.cc$'],
1110 ['exclude', 'browser/gtk/bookmark_editor_gtk_unittest\\.cc$'], 1112 ['exclude', 'browser/gtk/bookmark_editor_gtk_unittest\\.cc$'],
1111 ['exclude', 'browser/gtk/gtk_chrome_shrinkable_hbox_unittest\\.cc$' ], 1113 ['exclude', 'browser/gtk/gtk_chrome_shrinkable_hbox_unittest\\.cc$' ],
1112 ['exclude', 'browser/gtk/gtk_expanded_container_unittest\\.cc$'], 1114 ['exclude', 'browser/gtk/gtk_expanded_container_unittest\\.cc$'],
1113 ['exclude', 'browser/gtk/gtk_theme_provider_unittest\\.cc$'], 1115 ['exclude', 'browser/gtk/gtk_theme_provider_unittest\\.cc$'],
1114 ['exclude', 'browser/gtk/options/cookies_view_unittest\\.cc$'], 1116 ['exclude', 'browser/gtk/options/cookies_view_unittest\\.cc$'],
1115 ['exclude', 'browser/gtk/options/languages_page_gtk_unittest\\.cc$' ], 1117 ['exclude', 'browser/gtk/options/languages_page_gtk_unittest\\.cc$' ],
1116 ['exclude', 'browser/gtk/reload_button_gtk_unittest\\.cc$'], 1118 ['exclude', 'browser/gtk/reload_button_gtk_unittest\\.cc$'],
1117 ['exclude', 'browser/gtk/status_icons/status_tray_gtk_unittest\\.cc $'], 1119 ['exclude', 'browser/gtk/status_icons/status_tray_gtk_unittest\\.cc $'],
1118 ['exclude', 'browser/gtk/tabs/tab_renderer_gtk_unittest\\.cc$'], 1120 ['exclude', 'browser/gtk/tabs/tab_renderer_gtk_unittest\\.cc$'],
1121 ['include', 'browser/views/bookmark_bar_view_unittest.cc$'],
1119 ['include', 'browser/views/bookmark_context_menu_test.cc$'], 1122 ['include', 'browser/views/bookmark_context_menu_test.cc$'],
1120 ], 1123 ],
1121 }], 1124 }],
1122 ['OS=="linux" and chromeos==1', { 1125 ['OS=="linux" and chromeos==1', {
1123 'sources': [ 1126 'sources': [
1124 'browser/chromeos/notifications/desktop_notifications_unittest.cc', 1127 'browser/chromeos/notifications/desktop_notifications_unittest.cc',
1125 ], 1128 ],
1126 'sources/': [ 1129 'sources/': [
1127 ['exclude', 'browser/notifications/desktop_notifications_unittest.c c'], 1130 ['exclude', 'browser/notifications/desktop_notifications_unittest.c c'],
1128 ] 1131 ]
(...skipping 12 matching lines...) Expand all
1141 'sources': [ 1144 'sources': [
1142 'browser/spellchecker_platform_engine_unittest.cc', 1145 'browser/spellchecker_platform_engine_unittest.cc',
1143 ], 1146 ],
1144 'sources!': [ 1147 'sources!': [
1145 # Blocked on bookmark manager. 1148 # Blocked on bookmark manager.
1146 'browser/bookmarks/bookmark_context_menu_controller_unittest.cc', 1149 'browser/bookmarks/bookmark_context_menu_controller_unittest.cc',
1147 'browser/gtk/reload_button_gtk_unittest.cc', 1150 'browser/gtk/reload_button_gtk_unittest.cc',
1148 'browser/gtk/tabs/tab_renderer_gtk_unittest.cc', 1151 'browser/gtk/tabs/tab_renderer_gtk_unittest.cc',
1149 'browser/password_manager/password_store_default_unittest.cc', 1152 'browser/password_manager/password_store_default_unittest.cc',
1150 'browser/views/accessibility_event_router_views_unittest.cc', 1153 'browser/views/accessibility_event_router_views_unittest.cc',
1154 'browser/views/bookmark_bar_view_unittest.cc',
1151 'browser/views/bookmark_context_menu_test.cc', 1155 'browser/views/bookmark_context_menu_test.cc',
1152 'tools/convert_dict/convert_dict_unittest.cc', 1156 'tools/convert_dict/convert_dict_unittest.cc',
1153 '../third_party/hunspell/google/hunspell_tests.cc', 1157 '../third_party/hunspell/google/hunspell_tests.cc',
1154 ], 1158 ],
1155 # TODO(mark): We really want this for all non-static library targets, 1159 # TODO(mark): We really want this for all non-static library targets,
1156 # but when we tried to pull it up to the common.gypi level, it broke 1160 # but when we tried to pull it up to the common.gypi level, it broke
1157 # other things like the ui, startup, and page_cycler tests. *shrug* 1161 # other things like the ui, startup, and page_cycler tests. *shrug*
1158 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 1162 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
1159 1163
1160 # libwebcore.a is so large that ld may not have a sufficiently large 1164 # libwebcore.a is so large that ld may not have a sufficiently large
(...skipping 1365 matching lines...) Expand 10 before | Expand all | Expand 10 after
2526 ] 2530 ]
2527 }], # 'coverage!=0' 2531 }], # 'coverage!=0'
2528 ], # 'conditions' 2532 ], # 'conditions'
2529 } 2533 }
2530 2534
2531 # Local Variables: 2535 # Local Variables:
2532 # tab-width:2 2536 # tab-width:2
2533 # indent-tabs-mode:nil 2537 # indent-tabs-mode:nil
2534 # End: 2538 # End:
2535 # vim: set expandtab tabstop=2 shiftwidth=2: 2539 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/browser/views/bookmark_bar_view_unittest.cc ('k') | chrome/test/browser_with_test_window_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698