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

Unified Diff: ui/app_list/app_list.gyp

Issue 2131463002: Purge the App Launcher code from Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Zap mac-specific icon assets Created 4 years, 5 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
Index: ui/app_list/app_list.gyp
diff --git a/ui/app_list/app_list.gyp b/ui/app_list/app_list.gyp
index 392303a3103af7d2a1c517c48591c03b8b29f93a..59c05329c1be44bf11b4b005dc22a8acd6b35d5c 100644
--- a/ui/app_list/app_list.gyp
+++ b/ui/app_list/app_list.gyp
@@ -55,29 +55,6 @@
'app_list_switches.h',
'app_list_view_delegate.cc',
'app_list_view_delegate.h',
- 'cocoa/app_list_pager_view.h',
- 'cocoa/app_list_pager_view.mm',
- 'cocoa/app_list_view_controller.h',
- 'cocoa/app_list_view_controller.mm',
- 'cocoa/app_list_window_controller.h',
- 'cocoa/app_list_window_controller.mm',
- 'cocoa/apps_collection_view_drag_manager.h',
- 'cocoa/apps_collection_view_drag_manager.mm',
- 'cocoa/apps_grid_controller.h',
- 'cocoa/apps_grid_controller.mm',
- 'cocoa/apps_grid_view_item.h',
- 'cocoa/apps_grid_view_item.mm',
- 'cocoa/apps_pagination_model_observer.h',
- 'cocoa/apps_search_box_controller.h',
- 'cocoa/apps_search_box_controller.mm',
- 'cocoa/apps_search_results_controller.h',
- 'cocoa/apps_search_results_controller.mm',
- 'cocoa/apps_search_results_model_bridge.h',
- 'cocoa/apps_search_results_model_bridge.mm',
- 'cocoa/item_drag_controller.h',
- 'cocoa/item_drag_controller.mm',
- 'cocoa/scroll_view_with_no_scrollbars.h',
- 'cocoa/scroll_view_with_no_scrollbars.mm',
'folder_image.cc',
'folder_image.h',
'pagination_controller.cc',
@@ -206,20 +183,6 @@
['exclude', 'views/'],
],
}],
- ['OS=="mac"', {
- 'dependencies': [
- '../../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac',
- ],
- 'link_settings': {
- 'libraries': [
- '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
- ],
- },
- }, { # OS!="mac"
- 'sources/': [
- ['exclude', 'cocoa/'],
- ],
- }],
],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ],
@@ -265,13 +228,6 @@
# Note: sources list duplicated in GN build.
'app_list_item_list_unittest.cc',
'app_list_model_unittest.cc',
- 'cocoa/app_list_view_controller_unittest.mm',
- 'cocoa/app_list_window_controller_unittest.mm',
- 'cocoa/apps_grid_controller_unittest.mm',
- 'cocoa/apps_search_box_controller_unittest.mm',
- 'cocoa/apps_search_results_controller_unittest.mm',
- 'cocoa/test/apps_grid_controller_test_helper.h',
- 'cocoa/test/apps_grid_controller_test_helper.mm',
'folder_image_unittest.cc',
'pagination_model_unittest.cc',
'search/history_data_store_unittest.cc',
@@ -304,22 +260,6 @@
['exclude', 'views/'],
]
}],
- ['OS=="mac"', {
- 'dependencies': [
- '../events/events.gyp:events_test_support',
- '../gfx/gfx.gyp:gfx_test_support',
- ],
- 'conditions': [
- ['component=="static_library"', {
- # Needed to link to Obj-C static libraries.
- 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
- }],
- ],
- }, { # OS!="mac"
- 'sources/': [
- ['exclude', 'cocoa/'],
- ],
- }],
],
# Disable c4267 warnings until we fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ],

Powered by Google App Engine
This is Rietveld 408576698