Chromium Code Reviews| Index: ui/app_list/app_list.gyp |
| diff --git a/ui/app_list/app_list.gyp b/ui/app_list/app_list.gyp |
| index 3de12e30c8d1dae6ff91f0ad7032cf1c2d1d6d90..baef9d59e816d75cd5e224643759b9c11a8384eb 100644 |
| --- a/ui/app_list/app_list.gyp |
| +++ b/ui/app_list/app_list.gyp |
| @@ -16,55 +16,57 @@ |
| '../../skia/skia.gyp:skia', |
| '../compositor/compositor.gyp:compositor', |
| '../ui.gyp:ui', |
| - '../views/views.gyp:views', |
| ], |
| 'defines': [ |
| 'APP_LIST_IMPLEMENTATION', |
| ], |
| 'sources': [ |
| - 'app_list_background.cc', |
| - 'app_list_background.h', |
| 'app_list_constants.cc', |
| 'app_list_constants.h', |
| 'app_list_export.h', |
| 'app_list_item_model.cc', |
| 'app_list_item_model.h', |
| 'app_list_item_model_observer.h', |
| - 'app_list_item_view.cc', |
| - 'app_list_item_view.h', |
| 'app_list_model.cc', |
| 'app_list_model.h', |
| 'app_list_model_observer.h', |
| 'app_list_switches.cc', |
| 'app_list_switches.h', |
| - 'app_list_view.cc', |
| - 'app_list_view.h', |
| 'app_list_view_delegate.h', |
| - 'apps_grid_view.cc', |
| - 'apps_grid_view.h', |
| 'apps_grid_view_delegate.h', |
| - 'contents_view.cc', |
| - 'contents_view.h', |
| - 'page_switcher.cc', |
| - 'page_switcher.h', |
| + 'cocoa/app_list_view.h', |
| + 'cocoa/app_list_view.mm', |
| 'pagination_model.cc', |
| 'pagination_model.h', |
| 'pagination_model_observer.h', |
| - 'pulsing_block_view.cc', |
| - 'pulsing_block_view.h', |
| 'search_box_model.h', |
| 'search_box_model.cc', |
| 'search_box_model_observer.h', |
| - 'search_box_view.cc', |
| - 'search_box_view.h', |
| 'search_box_view_delegate.h', |
| + 'search_result_list_view_delegate.h', |
| + 'search_result_view_delegate.h', |
| 'search_result.cc', |
| 'search_result.h', |
| - 'search_result_view.cc', |
| - 'search_result_view.h', |
| - 'search_result_list_view.cc', |
| - 'search_result_list_view.h', |
| - 'search_result_list_view_delegate.h', |
| + 'views/apps_grid_view.cc', |
| + 'views/contents_view.h', |
| + 'views/app_list_view.cc', |
| + 'views/page_switcher.cc', |
| + 'views/app_list_view.h', |
| + 'views/contents_view.cc', |
| + 'views/search_result_view.h', |
| + 'views/pulsing_block_view.cc', |
| + 'views/page_switcher.h', |
| + 'views/pulsing_block_view.h', |
| + 'views/search_result_list_view.h', |
| + 'views/search_box_view.cc', |
| + 'views/apps_grid_view.h', |
| + 'views/search_box_view.h', |
| + 'views/app_list_item_view.h', |
| + 'views/search_result_list_view.cc', |
| + 'views/app_list_background.h', |
| + 'views/app_list_background.cc', |
| + 'views/app_list_item_view.cc', |
| + 'views/search_result_view.cc', |
|
xiyuan
2013/01/08 17:09:37
sort the files alphabetically.
tapted
2013/01/09 04:29:49
Done. (how did I miss that.. I've now fed it /usr/
|
| ], |
| 'conditions': [ |
| ['use_aura==1', { |
| @@ -72,6 +74,21 @@ |
| '../aura/aura.gyp:aura', |
| ], |
| }], |
| + ['toolkit_views==1', { |
| + 'dependencies': [ |
| + '../views/views.gyp:views', |
| + ], |
| + }, { # toolkit_views==0 |
| + 'sources/': [ |
| + ['exclude', 'views/'], |
| + ] |
| + }], |
| + ['OS=="mac"', { |
| + }, { # OS=="mac" |
| + 'sources/': [ |
| + ['exclude', 'cocoa/'], |
| + ] |
| + }], |
| ], |
| }, |
| { |
| @@ -84,18 +101,28 @@ |
| '../../testing/gtest.gyp:gtest', |
| '../compositor/compositor.gyp:compositor', |
| '../compositor/compositor.gyp:compositor_test_support', |
| - '../views/views.gyp:views', |
| - '../views/views.gyp:views_test_support', |
| 'app_list', |
| ], |
| 'sources': [ |
| - 'apps_grid_view_unittest.cc', |
| 'pagination_model_unittest.cc', |
| - 'test/apps_grid_view_test_api.cc', |
| - 'test/apps_grid_view_test_api.h', |
| 'test/app_list_test_suite.cc', |
| 'test/app_list_test_suite.h', |
| 'test/run_all_unittests.cc', |
| + 'views/apps_grid_view_unittest.cc', |
| + 'views/test/apps_grid_view_test_api.cc', |
| + 'views/test/apps_grid_view_test_api.h', |
|
xiyuan
2013/01/08 17:09:37
sort the file. Header file should precede its cc f
xiyuan
2013/01/08 17:10:37
Disregard this one. The current order is correct.
|
| + ], |
| + 'conditions': [ |
| + ['toolkit_views==1', { |
| + 'dependencies': [ |
| + '../views/views.gyp:views', |
| + '../views/views.gyp:views_test_support', |
| + ], |
| + }, { # toolkit_views==0 |
| + 'sources/': [ |
| + ['exclude', 'views/'], |
| + ] |
| + }], |
| ], |
| }, |
| ], |