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

Unified Diff: ui/app_list/app_list.gyp

Issue 11784034: Skeleton for app_list on OSX, and refactoring for enable_app_list=1 on OS=="mac". (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase for 175876 and 175961 Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | ui/app_list/app_list_background.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..e6783652745511f7af015f9a11d19d6e31f21beb 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_window.h',
+ 'cocoa/app_list_view_window.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.h',
'search_box_model_observer.h',
- 'search_box_view.cc',
- 'search_box_view.h',
'search_box_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',
+ 'search_result_view_delegate.h',
+ 'views/app_list_background.cc',
+ 'views/app_list_background.h',
+ 'views/app_list_item_view.cc',
+ 'views/app_list_item_view.h',
+ 'views/app_list_view.cc',
+ 'views/app_list_view.h',
+ 'views/apps_grid_view.cc',
+ 'views/apps_grid_view.h',
+ 'views/contents_view.cc',
+ 'views/contents_view.h',
+ 'views/page_switcher.cc',
+ 'views/page_switcher.h',
+ 'views/pulsing_block_view.cc',
+ 'views/pulsing_block_view.h',
+ 'views/search_box_view.cc',
+ 'views/search_box_view.h',
+ 'views/search_result_list_view.cc',
+ 'views/search_result_list_view.h',
+ 'views/search_result_view.cc',
+ 'views/search_result_view.h',
],
'conditions': [
['use_aura==1', {
@@ -72,6 +74,20 @@
'../aura/aura.gyp:aura',
],
}],
+ ['toolkit_views==1', {
+ 'dependencies': [
+ '../views/views.gyp:views',
+ ],
+ }, { # toolkit_views==0
+ 'sources/': [
+ ['exclude', 'views/'],
+ ],
+ }],
+ ['OS!="mac"', {
+ 'sources/': [
+ ['exclude', 'cocoa/'],
+ ],
+ }],
],
},
{
@@ -84,18 +100,38 @@
'../../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',
+ 'cocoa/app_list_view_window_unittest.mm',
+ 'views/apps_grid_view_unittest.cc',
+ 'views/test/apps_grid_view_test_api.cc',
+ 'views/test/apps_grid_view_test_api.h',
+ ],
+ 'conditions': [
+ ['toolkit_views==1', {
+ 'dependencies': [
+ '../views/views.gyp:views',
+ '../views/views.gyp:views_test_support',
+ ],
+ }, { # toolkit_views==0
+ 'sources/': [
+ ['exclude', 'views/'],
+ ]
+ }],
+ ['OS=="mac"', {
+ 'dependencies': [
+ '../ui.gyp:ui_test_support',
+ ],
+ }, { # OS!="mac"
+ 'sources/': [
+ ['exclude', 'cocoa/'],
+ ],
+ }],
],
},
],
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | ui/app_list/app_list_background.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698