| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 'app_list_switches.cc', | 46 'app_list_switches.cc', |
| 47 'app_list_switches.h', | 47 'app_list_switches.h', |
| 48 'app_list_view_delegate.cc', | 48 'app_list_view_delegate.cc', |
| 49 'app_list_view_delegate.h', | 49 'app_list_view_delegate.h', |
| 50 'cocoa/app_list_pager_view.h', | 50 'cocoa/app_list_pager_view.h', |
| 51 'cocoa/app_list_pager_view.mm', | 51 'cocoa/app_list_pager_view.mm', |
| 52 'cocoa/app_list_view_controller.h', | 52 'cocoa/app_list_view_controller.h', |
| 53 'cocoa/app_list_view_controller.mm', | 53 'cocoa/app_list_view_controller.mm', |
| 54 'cocoa/app_list_window_controller.h', | 54 'cocoa/app_list_window_controller.h', |
| 55 'cocoa/app_list_window_controller.mm', | 55 'cocoa/app_list_window_controller.mm', |
| 56 'cocoa/apps_collection_view_drag_manager.h', | |
| 57 'cocoa/apps_collection_view_drag_manager.mm', | |
| 58 'cocoa/apps_grid_controller.h', | 56 'cocoa/apps_grid_controller.h', |
| 59 'cocoa/apps_grid_controller.mm', | 57 'cocoa/apps_grid_controller.mm', |
| 60 'cocoa/apps_grid_view_item.h', | |
| 61 'cocoa/apps_grid_view_item.mm', | |
| 62 'cocoa/apps_pagination_model_observer.h', | 58 'cocoa/apps_pagination_model_observer.h', |
| 63 'cocoa/apps_search_box_controller.h', | 59 'cocoa/apps_search_box_controller.h', |
| 64 'cocoa/apps_search_box_controller.mm', | 60 'cocoa/apps_search_box_controller.mm', |
| 65 'cocoa/apps_search_results_controller.h', | 61 'cocoa/apps_search_results_controller.h', |
| 66 'cocoa/apps_search_results_controller.mm', | 62 'cocoa/apps_search_results_controller.mm', |
| 67 'cocoa/apps_search_results_model_bridge.h', | 63 'cocoa/apps_search_results_model_bridge.h', |
| 68 'cocoa/apps_search_results_model_bridge.mm', | 64 'cocoa/apps_search_results_model_bridge.mm', |
| 69 'cocoa/item_drag_controller.h', | |
| 70 'cocoa/item_drag_controller.mm', | |
| 71 'cocoa/scroll_view_with_no_scrollbars.h', | |
| 72 'cocoa/scroll_view_with_no_scrollbars.mm', | |
| 73 'cocoa/signin_view_controller.h', | 65 'cocoa/signin_view_controller.h', |
| 74 'cocoa/signin_view_controller.mm', | 66 'cocoa/signin_view_controller.mm', |
| 75 'pagination_model.cc', | 67 'pagination_model.cc', |
| 76 'pagination_model.h', | 68 'pagination_model.h', |
| 77 'pagination_model_observer.h', | 69 'pagination_model_observer.h', |
| 78 'search_box_model.cc', | 70 'search_box_model.cc', |
| 79 'search_box_model.h', | 71 'search_box_model.h', |
| 80 'search_box_model_observer.h', | 72 'search_box_model_observer.h', |
| 81 'search_result.cc', | 73 'search_result.cc', |
| 82 'search_result.h', | 74 'search_result.h', |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 ], | 138 ], |
| 147 }], | 139 }], |
| 148 ['toolkit_views==1', { | 140 ['toolkit_views==1', { |
| 149 'dependencies': [ | 141 'dependencies': [ |
| 150 '../../content/content.gyp:content_browser', | 142 '../../content/content.gyp:content_browser', |
| 151 '../events/events.gyp:events', | 143 '../events/events.gyp:events', |
| 152 '../views/controls/webview/webview.gyp:webview', | 144 '../views/controls/webview/webview.gyp:webview', |
| 153 '../views/views.gyp:views', | 145 '../views/views.gyp:views', |
| 154 '../wm/wm.gyp:wm_core', | 146 '../wm/wm.gyp:wm_core', |
| 155 ], | 147 ], |
| 156 }, { # toolkit_views==0 | |
| 157 'sources/': [ | |
| 158 ['exclude', 'views/'], | |
| 159 ], | |
| 160 }], | 148 }], |
| 161 ['OS=="mac"', { | 149 ['OS=="mac"', { |
| 162 'dependencies': [ | 150 'dependencies': [ |
| 163 '../../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp
:google_toolbox_for_mac', | 151 '../../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp
:google_toolbox_for_mac', |
| 152 '../events/events.gyp:events', |
| 153 '../views_core/views_core.gyp:views_core', |
| 164 ], | 154 ], |
| 165 'link_settings': { | 155 'link_settings': { |
| 166 'libraries': [ | 156 'libraries': [ |
| 167 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', | 157 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', |
| 168 ], | 158 ], |
| 169 }, | 159 }, |
| 160 'sources!': [ |
| 161 'views/apps_container_view.cc', |
| 162 'views/apps_container_view.h', |
| 163 'views/app_list_background.cc', |
| 164 'views/app_list_background.h', |
| 165 'views/app_list_drag_and_drop_host.h', |
| 166 'views/app_list_folder_view.cc', |
| 167 'views/app_list_folder_view.h', |
| 168 'views/app_list_main_view.cc', |
| 169 'views/app_list_main_view.h', |
| 170 'views/app_list_menu_views.cc', |
| 171 'views/app_list_menu_views.h', |
| 172 'views/app_list_view.cc', |
| 173 'views/app_list_view.h', |
| 174 'views/app_list_view_observer.h', |
| 175 'views/contents_view.cc', |
| 176 'views/contents_view.h', |
| 177 'views/pulsing_block_view.cc', |
| 178 'views/pulsing_block_view.h', |
| 179 'views/search_box_view.cc', |
| 180 'views/search_box_view.h', |
| 181 'views/search_box_view_delegate.h', |
| 182 'views/search_result_actions_view.cc', |
| 183 'views/search_result_actions_view.h', |
| 184 'views/search_result_list_view.cc', |
| 185 'views/search_result_list_view.h', |
| 186 'views/search_result_list_view_delegate.h', |
| 187 'views/search_result_view.cc', |
| 188 'views/search_result_view.h', |
| 189 'views/search_result_view_delegate.h', |
| 190 'views/signin_view.cc', |
| 191 'views/signin_view.h', |
| 192 'views/speech_view.cc', |
| 193 'views/speech_view.h', |
| 194 ], |
| 170 }, { # OS!="mac" | 195 }, { # OS!="mac" |
| 171 'sources/': [ | 196 'sources/': [ |
| 172 ['exclude', 'cocoa/'], | 197 ['exclude', 'cocoa/'], |
| 173 ], | 198 ], |
| 174 }], | 199 }], |
| 175 ], | 200 ], |
| 176 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 201 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 177 'msvs_disabled_warnings': [ 4267, ], | 202 'msvs_disabled_warnings': [ 4267, ], |
| 178 }, | 203 }, |
| 179 { | 204 { |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 'cocoa/apps_grid_controller_unittest.mm', | 241 'cocoa/apps_grid_controller_unittest.mm', |
| 217 'cocoa/apps_search_box_controller_unittest.mm', | 242 'cocoa/apps_search_box_controller_unittest.mm', |
| 218 'cocoa/apps_search_results_controller_unittest.mm', | 243 'cocoa/apps_search_results_controller_unittest.mm', |
| 219 'cocoa/signin_view_controller_unittest.mm', | 244 'cocoa/signin_view_controller_unittest.mm', |
| 220 'cocoa/test/apps_grid_controller_test_helper.h', | 245 'cocoa/test/apps_grid_controller_test_helper.h', |
| 221 'cocoa/test/apps_grid_controller_test_helper.mm', | 246 'cocoa/test/apps_grid_controller_test_helper.mm', |
| 222 'test/run_all_unittests.cc', | 247 'test/run_all_unittests.cc', |
| 223 'views/app_list_main_view_unittest.cc', | 248 'views/app_list_main_view_unittest.cc', |
| 224 'views/apps_grid_view_unittest.cc', | 249 'views/apps_grid_view_unittest.cc', |
| 225 'views/folder_header_view_unittest.cc', | 250 'views/folder_header_view_unittest.cc', |
| 251 'views/progress_bar_view_unittest_mac.mm', |
| 226 'views/search_box_view_unittest.cc', | 252 'views/search_box_view_unittest.cc', |
| 227 'views/search_result_list_view_unittest.cc', | 253 'views/search_result_list_view_unittest.cc', |
| 228 'views/test/apps_grid_view_test_api.cc', | 254 'views/test/apps_grid_view_test_api.cc', |
| 229 'views/test/apps_grid_view_test_api.h', | 255 'views/test/apps_grid_view_test_api.h', |
| 230 ], | 256 ], |
| 231 'conditions': [ | 257 'conditions': [ |
| 232 ['toolkit_views==1', { | 258 ['toolkit_views==1', { |
| 233 'dependencies': [ | 259 'dependencies': [ |
| 234 '../views/views.gyp:views', | 260 '../views/views.gyp:views', |
| 235 '../views/views.gyp:views_test_support', | 261 '../views/views.gyp:views_test_support', |
| 236 '../../content/content.gyp:content', | 262 '../../content/content.gyp:content', |
| 237 '../../content/content.gyp:content_browser', | 263 '../../content/content.gyp:content_browser', |
| 238 ], | 264 ], |
| 239 }, { # toolkit_views==0 | |
| 240 'sources/': [ | |
| 241 ['exclude', 'views/'], | |
| 242 ] | |
| 243 }], | 265 }], |
| 244 ['OS=="mac"', { | 266 ['OS=="mac"', { |
| 245 'dependencies': [ | 267 'dependencies': [ |
| 246 '../events/events.gyp:events_test_support', | 268 '../events/events.gyp:events_test_support', |
| 247 '../gfx/gfx.gyp:gfx_test_support', | 269 '../gfx/gfx.gyp:gfx_test_support', |
| 270 '../views_core/views_core.gyp:views_core', |
| 248 ], | 271 ], |
| 249 'conditions': [ | 272 'conditions': [ |
| 250 ['component=="static_library"', { | 273 ['component=="static_library"', { |
| 251 # Needed to link to Obj-C static libraries. | 274 # Needed to link to Obj-C static libraries. |
| 252 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, | 275 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, |
| 253 }], | 276 }], |
| 254 ], | 277 ], |
| 278 'sources!': [ |
| 279 'views/app_list_main_view_unittest.cc', |
| 280 'views/apps_grid_view_unittest.cc', |
| 281 'views/test/apps_grid_view_test_api.cc', |
| 282 'views/test/apps_grid_view_test_api.h', |
| 283 ], |
| 255 }, { # OS!="mac" | 284 }, { # OS!="mac" |
| 256 'sources/': [ | 285 'sources/': [ |
| 257 ['exclude', 'cocoa/'], | 286 ['exclude', 'cocoa/'], |
| 258 ], | 287 ], |
| 259 }], | 288 }], |
| 260 # See http://crbug.com/162998#c4 for why this is needed. | 289 # See http://crbug.com/162998#c4 for why this is needed. |
| 261 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 | 290 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 |
| 262 ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tc
malloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', { | 291 ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tc
malloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', { |
| 263 'dependencies': [ | 292 'dependencies': [ |
| 264 '../../base/allocator/allocator.gyp:allocator', | 293 '../../base/allocator/allocator.gyp:allocator', |
| 265 # The following two dependencies provide the missing | 294 # The following two dependencies provide the missing |
| 266 # symbol HeapProfilerStart in Linux component builds. | 295 # symbol HeapProfilerStart in Linux component builds. |
| 267 # They probably can be removed after http://crbug.com/263316 | 296 # They probably can be removed after http://crbug.com/263316 |
| 268 '../../webkit/child/webkit_child.gyp:webkit_child', | 297 '../../webkit/child/webkit_child.gyp:webkit_child', |
| 269 ], | 298 ], |
| 270 }], | 299 }], |
| 271 ['OS=="win" and win_use_allocator_shim==1', { | 300 ['OS=="win" and win_use_allocator_shim==1', { |
| 272 'dependencies': [ | 301 'dependencies': [ |
| 273 '../../base/allocator/allocator.gyp:allocator', | 302 '../../base/allocator/allocator.gyp:allocator', |
| 274 ], | 303 ], |
| 275 }], | 304 }], |
| 276 ], | 305 ], |
| 277 # Disable c4267 warnings until we fix size_t to int truncations. | 306 # Disable c4267 warnings until we fix size_t to int truncations. |
| 278 'msvs_disabled_warnings': [ 4267, ], | 307 'msvs_disabled_warnings': [ 4267, ], |
| 279 }, | 308 }, |
| 280 ], | 309 ], |
| 281 } | 310 } |
| OLD | NEW |