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 17 matching lines...) Expand all Loading... |
28 '../../third_party/icu/icu.gyp:icuuc', | 28 '../../third_party/icu/icu.gyp:icuuc', |
29 'resources/app_list_resources.gyp:app_list_resources', | 29 'resources/app_list_resources.gyp:app_list_resources', |
30 ], | 30 ], |
31 'defines': [ | 31 'defines': [ |
32 'APP_LIST_IMPLEMENTATION', | 32 'APP_LIST_IMPLEMENTATION', |
33 ], | 33 ], |
34 'sources': [ | 34 'sources': [ |
35 # Note: sources list duplicated in GN build. | 35 # Note: sources list duplicated in GN build. |
36 'app_list_constants.cc', | 36 'app_list_constants.cc', |
37 'app_list_constants.h', | 37 'app_list_constants.h', |
| 38 'app_list_shower.h', |
| 39 'app_list_shower_impl.cc', |
| 40 'app_list_shower_impl.h', |
38 'app_list_export.h', | 41 'app_list_export.h', |
39 'app_list_folder_item.cc', | 42 'app_list_folder_item.cc', |
40 'app_list_folder_item.h', | 43 'app_list_folder_item.h', |
41 'app_list_item.cc', | 44 'app_list_item.cc', |
42 'app_list_item.h', | 45 'app_list_item.h', |
43 'app_list_item_list.cc', | 46 'app_list_item_list.cc', |
44 'app_list_item_list.h', | 47 'app_list_item_list.h', |
45 'app_list_item_list_observer.h', | 48 'app_list_item_list_observer.h', |
46 'app_list_item_observer.h', | 49 'app_list_item_observer.h', |
| 50 'app_list_shower_delegate.h', |
| 51 'app_list_shower_delegate_factory.h', |
47 'app_list_menu.cc', | 52 'app_list_menu.cc', |
48 'app_list_menu.h', | 53 'app_list_menu.h', |
49 'app_list_model.cc', | 54 'app_list_model.cc', |
50 'app_list_model.h', | 55 'app_list_model.h', |
51 'app_list_model_observer.h', | 56 'app_list_model_observer.h', |
52 'app_list_switches.cc', | 57 'app_list_switches.cc', |
53 'app_list_switches.h', | 58 'app_list_switches.h', |
54 'app_list_view_delegate.cc', | 59 'app_list_view_delegate.cc', |
55 'app_list_view_delegate.h', | 60 'app_list_view_delegate.h', |
56 'cocoa/app_list_pager_view.h', | 61 'cocoa/app_list_pager_view.h', |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
211 'link_settings': { | 216 'link_settings': { |
212 'libraries': [ | 217 'libraries': [ |
213 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', | 218 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', |
214 ], | 219 ], |
215 }, | 220 }, |
216 }, { # OS!="mac" | 221 }, { # OS!="mac" |
217 'sources/': [ | 222 'sources/': [ |
218 ['exclude', 'cocoa/'], | 223 ['exclude', 'cocoa/'], |
219 ], | 224 ], |
220 }], | 225 }], |
| 226 ['use_ash==1', { |
| 227 'dependencies': [ |
| 228 '../keyboard/keyboard.gyp:keyboard', |
| 229 ], |
| 230 }, { # use_ash == 0 |
| 231 'sources!': [ |
| 232 'app_list_shower_impl.cc', |
| 233 'app_list_shower_impl.h', |
| 234 'app_list_shower.h', |
| 235 'app_list_shower_delegate.h', |
| 236 'app_list_shower_delegate_factory.h', |
| 237 ], |
| 238 }], |
221 ], | 239 ], |
222 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 240 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
223 'msvs_disabled_warnings': [ 4267, ], | 241 'msvs_disabled_warnings': [ 4267, ], |
224 }, | 242 }, |
225 { | 243 { |
226 # GN version: //ui/app_list:test_support | 244 # GN version: //ui/app_list:test_support |
227 'target_name': 'app_list_test_support', | 245 'target_name': 'app_list_test_support', |
228 'type': 'static_library', | 246 'type': 'static_library', |
229 'dependencies': [ | 247 'dependencies': [ |
230 '../../base/base.gyp:base', | 248 '../../base/base.gyp:base', |
231 '../gfx/gfx.gyp:gfx', | 249 '../gfx/gfx.gyp:gfx', |
232 '../gfx/gfx.gyp:gfx_geometry', | 250 '../gfx/gfx.gyp:gfx_geometry', |
233 'app_list', | 251 'app_list', |
234 ], | 252 ], |
235 'sources': [ | 253 'sources': [ |
236 # Note: sources list duplicated in GN build. | 254 # Note: sources list duplicated in GN build. |
| 255 'test/app_list_shower_impl_test_api.cc', |
| 256 'test/app_list_shower_impl_test_api.h', |
237 'test/app_list_test_model.cc', | 257 'test/app_list_test_model.cc', |
238 'test/app_list_test_model.h', | 258 'test/app_list_test_model.h', |
239 'test/app_list_test_view_delegate.cc', | 259 'test/app_list_test_view_delegate.cc', |
240 'test/app_list_test_view_delegate.h', | 260 'test/app_list_test_view_delegate.h', |
241 'test/test_search_result.cc', | 261 'test/test_search_result.cc', |
242 'test/test_search_result.h', | 262 'test/test_search_result.h', |
243 ], | 263 ], |
244 }, | 264 }, |
245 { | 265 { |
246 # GN version: //ui/app_list:app_list_unittests | 266 # GN version: //ui/app_list:app_list_unittests |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
310 ['component=="static_library"', { | 330 ['component=="static_library"', { |
311 # Needed to link to Obj-C static libraries. | 331 # Needed to link to Obj-C static libraries. |
312 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, | 332 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, |
313 }], | 333 }], |
314 ], | 334 ], |
315 }, { # OS!="mac" | 335 }, { # OS!="mac" |
316 'sources/': [ | 336 'sources/': [ |
317 ['exclude', 'cocoa/'], | 337 ['exclude', 'cocoa/'], |
318 ], | 338 ], |
319 }], | 339 }], |
| 340 ['use_ash==1', { |
| 341 'sources': [ "app_list_shower_impl_unittest.cc", ], |
| 342 }], |
320 ], | 343 ], |
321 # Disable c4267 warnings until we fix size_t to int truncations. | 344 # Disable c4267 warnings until we fix size_t to int truncations. |
322 'msvs_disabled_warnings': [ 4267, ], | 345 'msvs_disabled_warnings': [ 4267, ], |
323 }, | 346 }, |
324 ], | 347 ], |
325 'conditions': [ | 348 'conditions': [ |
326 ['toolkit_views==1', { | 349 ['toolkit_views==1', { |
327 'targets': [ | 350 'targets': [ |
328 { | 351 { |
329 'target_name': 'app_list_demo', | 352 'target_name': 'app_list_demo', |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
382 'dependencies': [ | 405 'dependencies': [ |
383 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 406 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
384 ], | 407 ], |
385 }], | 408 }], |
386 ], | 409 ], |
387 }, | 410 }, |
388 ], | 411 ], |
389 }], | 412 }], |
390 ], | 413 ], |
391 } | 414 } |
OLD | NEW |