[stash] 20140404-crbug-312961-mac-views-bridge-C-wholegrid

ui/app_list/app_list.gyp

Index: ui/app_list/app_list.gyp
diff --git a/ui/app_list/app_list.gyp b/ui/app_list/app_list.gyp
index 182d9c656cfb963e1f8703cf6a73c62fc7103303..61b8a1ac9d5b2868e843c6fe84d44618b72697cc 100644
--- a/ui/app_list/app_list.gyp
+++ b/ui/app_list/app_list.gyp
@@ -53,12 +53,8 @@
         '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',
@@ -66,10 +62,6 @@
         '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',
         'cocoa/signin_view_controller.h',
         'cocoa/signin_view_controller.mm',
         'pagination_model.cc',
@@ -153,20 +145,53 @@
             '../views/views.gyp:views',
             '../wm/wm.gyp:wm_core',
           ],
-        }, {  # toolkit_views==0
-          'sources/': [
-            ['exclude', 'views/'],
-          ],
         }],
         ['OS=="mac"', {
           'dependencies': [
             '../../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac',
+            '../events/events.gyp:events',
+            '../views_core/views_core.gyp:views_core',
           ],
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
             ],
           },
+          'sources!': [
+            'views/apps_container_view.cc',
+            'views/apps_container_view.h',
+            'views/app_list_background.cc',
+            'views/app_list_background.h',
+            'views/app_list_drag_and_drop_host.h',
+            'views/app_list_folder_view.cc',
+            'views/app_list_folder_view.h',
+            'views/app_list_main_view.cc',
+            'views/app_list_main_view.h',
+            'views/app_list_menu_views.cc',
+            'views/app_list_menu_views.h',
+            'views/app_list_view.cc',
+            'views/app_list_view.h',
+            'views/app_list_view_observer.h',
+            'views/contents_view.cc',
+            'views/contents_view.h',
+            'views/pulsing_block_view.cc',
+            'views/pulsing_block_view.h',
+            'views/search_box_view.cc',
+            'views/search_box_view.h',
+            'views/search_box_view_delegate.h',
+            'views/search_result_actions_view.cc',
+            'views/search_result_actions_view.h',
+            'views/search_result_list_view.cc',
+            'views/search_result_list_view.h',
+            'views/search_result_list_view_delegate.h',
+            'views/search_result_view.cc',
+            'views/search_result_view.h',
+            'views/search_result_view_delegate.h',
+            'views/signin_view.cc',
+            'views/signin_view.h',
+            'views/speech_view.cc',
+            'views/speech_view.h',
+          ],
         }, {  # OS!="mac"
           'sources/': [
             ['exclude', 'cocoa/'],
@@ -223,6 +248,7 @@
         'views/app_list_main_view_unittest.cc',
         'views/apps_grid_view_unittest.cc',
         'views/folder_header_view_unittest.cc',
+        'views/progress_bar_view_unittest_mac.mm',
         'views/search_box_view_unittest.cc',
         'views/search_result_list_view_unittest.cc',
         'views/test/apps_grid_view_test_api.cc',
@@ -236,15 +262,12 @@
             '../../content/content.gyp:content',
             '../../content/content.gyp:content_browser',
           ],
-        }, {  # toolkit_views==0
-          'sources/': [
-            ['exclude', 'views/'],
-          ]
         }],
         ['OS=="mac"', {
           'dependencies': [
             '../events/events.gyp:events_test_support',
             '../gfx/gfx.gyp:gfx_test_support',
+            '../views_core/views_core.gyp:views_core',
           ],
           'conditions': [
             ['component=="static_library"', {
@@ -252,6 +275,12 @@
               'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
             }],
           ],
+          'sources!': [
+            'views/app_list_main_view_unittest.cc',
+            'views/apps_grid_view_unittest.cc',
+            'views/test/apps_grid_view_test_api.cc',
+            'views/test/apps_grid_view_test_api.h',
+          ],
         }, {  # OS!="mac"
           'sources/': [
             ['exclude', 'cocoa/'],