| Index: ui/app_list/app_list.gyp
|
| diff --git a/ui/app_list/app_list.gyp b/ui/app_list/app_list.gyp
|
| index e8d42112297c47d8205d911cd435db6dddd9f2e1..b43ef718f0ac43389ce209e96b617f201c4ee0e8 100644
|
| --- a/ui/app_list/app_list.gyp
|
| +++ b/ui/app_list/app_list.gyp
|
| @@ -35,6 +35,9 @@
|
| # Note: sources list duplicated in GN build.
|
| 'app_list_constants.cc',
|
| 'app_list_constants.h',
|
| + 'app_list_shower.h',
|
| + 'app_list_shower_impl.cc',
|
| + 'app_list_shower_impl.h',
|
| 'app_list_export.h',
|
| 'app_list_folder_item.cc',
|
| 'app_list_folder_item.h',
|
| @@ -44,6 +47,8 @@
|
| 'app_list_item_list.h',
|
| 'app_list_item_list_observer.h',
|
| 'app_list_item_observer.h',
|
| + 'app_list_shower_delegate.h',
|
| + 'app_list_shower_delegate_factory.h',
|
| 'app_list_menu.cc',
|
| 'app_list_menu.h',
|
| 'app_list_model.cc',
|
| @@ -218,6 +223,19 @@
|
| ['exclude', 'cocoa/'],
|
| ],
|
| }],
|
| + ['use_ash==1', {
|
| + 'dependencies': [
|
| + '../keyboard/keyboard.gyp:keyboard',
|
| + ],
|
| + }, { # use_ash == 0
|
| + 'sources!': [
|
| + 'app_list_shower_impl.cc',
|
| + 'app_list_shower_impl.h',
|
| + 'app_list_shower.h',
|
| + 'app_list_shower_delegate.h',
|
| + 'app_list_shower_delegate_factory.h',
|
| + ],
|
| + }],
|
| ],
|
| # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
|
| 'msvs_disabled_warnings': [ 4267, ],
|
| @@ -234,6 +252,8 @@
|
| ],
|
| 'sources': [
|
| # Note: sources list duplicated in GN build.
|
| + 'test/app_list_shower_impl_test_api.cc',
|
| + 'test/app_list_shower_impl_test_api.h',
|
| 'test/app_list_test_model.cc',
|
| 'test/app_list_test_model.h',
|
| 'test/app_list_test_view_delegate.cc',
|
| @@ -317,6 +337,9 @@
|
| ['exclude', 'cocoa/'],
|
| ],
|
| }],
|
| + ['use_ash==1', {
|
| + 'sources': [ "app_list_shower_impl_unittest.cc", ],
|
| + }],
|
| ],
|
| # Disable c4267 warnings until we fix size_t to int truncations.
|
| 'msvs_disabled_warnings': [ 4267, ],
|
|
|