Make the ENABLE_APP_LIST build flag work on Linux

chrome/chrome_browser_ui.gypi

Index: chrome/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index e71a5da659d65174ff0ba64772e165abd70a122c..de87c4f4154578a5e79a8881ffb471de5a27f001 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -1338,10 +1338,6 @@
       'browser/ui/input_method/input_method_engine.h',
       'browser/ui/input_method/input_method_engine_base.cc',
       'browser/ui/input_method/input_method_engine_base.h',
-      'browser/ui/views/app_list/linux/app_list_linux.cc',
-      'browser/ui/views/app_list/linux/app_list_linux.h',
-      'browser/ui/views/app_list/linux/app_list_service_linux.cc',
-      'browser/ui/views/app_list/linux/app_list_service_linux.h',
       'browser/ui/views/apps/chrome_app_window_client_views_linux.cc',
       'browser/ui/views/first_run_dialog.cc',
       'browser/ui/views/first_run_dialog.h',
@@ -1362,6 +1358,12 @@
       'browser/ui/webui/help/version_updater_basic.cc',
       'browser/ui/webui/help/version_updater_basic.h',
     ],
+    'chrome_browser_ui_desktop_linux_app_list_sources': [
+      'browser/ui/views/app_list/linux/app_list_linux.cc',
+      'browser/ui/views/app_list/linux/app_list_linux.h',
+      'browser/ui/views/app_list/linux/app_list_service_linux.cc',
+      'browser/ui/views/app_list/linux/app_list_service_linux.h',
+    ],
     # Files used on iOS. iOS uses only these files and does not share other
     # lists, so a file may appear here and in the non_ios_sources also.
     'chrome_browser_ui_ios_sources': [
@@ -2041,17 +2043,13 @@
     ],
     # Cross-platform views sources also ready for toolkit-views on Mac.
     'chrome_browser_ui_views_sources': [
-      'browser/ui/app_list/app_list_controller_delegate_views.cc',
-      'browser/ui/app_list/app_list_controller_delegate_views.h',
-      'browser/ui/app_list/app_list_service_views.cc',
-      'browser/ui/app_list/app_list_service_views.h',
-      'browser/ui/app_list/app_list_shower_views.cc',
-      'browser/ui/app_list/app_list_shower_views.h',
       'browser/ui/autofill/save_card_bubble_controller.h',
       'browser/ui/autofill/save_card_bubble_controller_impl.cc',
       'browser/ui/autofill/save_card_bubble_controller_impl.h',
       'browser/ui/autofill/save_card_bubble_view.h',
       'browser/ui/browser_dialogs_mac.cc',
+      'browser/ui/views/apps/app_info_dialog/app_info_dialog_container.cc',
+      'browser/ui/views/apps/app_info_dialog/app_info_dialog_container.h',
       'browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc',
       'browser/ui/views/apps/app_info_dialog/app_info_dialog_views.h',
       'browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc',
@@ -2106,6 +2104,14 @@
       'browser/ui/views/website_settings/website_settings_popup_view.cc',
       'browser/ui/views/website_settings/website_settings_popup_view.h',
     ],
+    'chrome_browser_ui_views_app_list_sources': [
+      'browser/ui/app_list/app_list_controller_delegate_views.cc',
+      'browser/ui/app_list/app_list_controller_delegate_views.h',
+      'browser/ui/app_list/app_list_service_views.cc',
+      'browser/ui/app_list/app_list_service_views.h',
+      'browser/ui/app_list/app_list_shower_views.cc',
+      'browser/ui/app_list/app_list_shower_views.h',
+    ],
     # Views files for everywhere but ChromeOS.
     'chrome_browser_ui_views_non_chromeos_sources': [
       'browser/ui/external_protocol_dialog_delegate.cc',
@@ -2670,8 +2676,6 @@
       'browser/ui/app_list/start_page_service.h',
       'browser/ui/app_list/start_page_service_factory.cc',
       'browser/ui/app_list/start_page_service_factory.h',
-      'browser/ui/views/app_list/app_list_dialog_container.cc',
-      'browser/ui/views/app_list/app_list_dialog_container.h',
       'browser/ui/views/app_list/win/activation_tracker_win.cc',
       'browser/ui/views/app_list/win/activation_tracker_win.h',
       'browser/ui/views/app_list/win/app_list_controller_delegate_win.cc',
@@ -3029,6 +3033,9 @@
             '<(DEPTH)/components/components.gyp:constrained_window',
           ],
           'conditions': [
+            ['enable_app_list==1', {
+              'sources': [ '<@(chrome_browser_ui_views_app_list_sources' ],
+            }],
             ['chromeos == 0 and (OS!="mac" or mac_views_browser==1)', {
               'sources': [ '<@(chrome_browser_ui_views_non_chromeos_sources)' ],
             }],
@@ -3237,6 +3244,13 @@
             '../ui/events/events.gyp:dom_keycode_converter',
           ],
           'sources': [ '<@(chrome_browser_ui_desktop_linux_sources)' ],
+          'conditions': [
+            ['enable_app_list', {
+              'sources': [
+                '<@(chrome_browser_ui_desktop_linux_app_list_sources)',
+              ],
+            }],
+          ],
         }],
         ['OS=="linux"', {  # Both desktop Linux and ChromeOS.
           'sources': [ '<@(chrome_browser_ui_linux_sources)' ],