Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / app_list / app_list.gyp

diff --git a/src/ui/app_list/app_list.gyp b/src/ui/app_list/app_list.gyp
index 39675a8..061e080 100644 (file)
--- a/src/ui/app_list/app_list.gyp
+++ b/src/ui/app_list/app_list.gyp
@@ -15,6 +15,7 @@
         '../../base/base.gyp:base',
         '../../base/base.gyp:base_i18n',
         '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '../../components/components.gyp:keyed_service_core',
         '../../skia/skia.gyp:skia',
         '../base/ui_base.gyp:ui_base',
         '../compositor/compositor.gyp:compositor',
@@ -73,6 +74,8 @@
         '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',
         'pagination_controller.h',
         'pagination_model.cc',
@@ -81,10 +84,23 @@
         'search_box_model.cc',
         'search_box_model.h',
         'search_box_model_observer.h',
+        'search_controller.cc',
+        'search_controller.h',
         'search_provider.cc',
         'search_provider.h',
         'search_result.cc',
         'search_result.h',
+        'search/dictionary_data_store.cc',
+        'search/dictionary_data_store.h',
+        'search/history.cc',
+        'search/history.h',
+        'search/history_data.cc',
+        'search/history_data.h',
+        'search/history_data_store.cc',
+        'search/history_data_store.h',
+        'search/history_types.h',
+        'search/mixer.cc',
+        'search/mixer.h',
         'search/term_break_iterator.cc',
         'search/term_break_iterator.h',
         'search/tokenized_string.cc',
@@ -96,6 +112,8 @@
         'speech_ui_model.cc',
         'speech_ui_model.h',
         'speech_ui_model_observer.h',
+        'views/all_apps_tile_item_view.h',
+        'views/all_apps_tile_item_view.cc',
         'views/apps_container_view.cc',
         'views/apps_container_view.h',
         'views/app_list_background.cc',
@@ -138,9 +156,13 @@
         'views/search_box_view_delegate.h',
         'views/search_result_actions_view.cc',
         'views/search_result_actions_view.h',
+        'views/search_result_container_view.cc',
+        'views/search_result_container_view.h',
         'views/search_result_list_view.cc',
         'views/search_result_list_view.h',
         'views/search_result_list_view_delegate.h',
+        'views/search_result_tile_item_view.cc',
+        'views/search_result_tile_item_view.h',
         'views/search_result_view.cc',
         'views/search_result_view.h',
         'views/speech_view.cc',
@@ -204,6 +226,8 @@
         'test/app_list_test_model.h',
         'test/app_list_test_view_delegate.cc',
         'test/app_list_test_view_delegate.h',
+        'test/test_search_result.cc',
+        'test/test_search_result.h',
       ],
     },
     {
@@ -234,6 +258,9 @@
         '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',
+        'search/history_data_store_unittest.cc',
+        'search/mixer_unittest.cc',
         'search/term_break_iterator_unittest.cc',
         'search/tokenized_string_char_iterator_unittest.cc',
         'search/tokenized_string_match_unittest.cc',
@@ -329,6 +356,11 @@
                 '../../content/content.gyp:content_startup_helper_win',
               ],
             }],
+            ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', {
+              'dependencies': [
+                '<(DEPTH)/base/allocator/allocator.gyp:allocator',
+              ],
+            }],
           ],
         },
       ],