Prepare for building with enable_app_list=0 on Desktop

chrome/chrome_browser_ui.gypi

 # Copyright 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     # There are two sections of sources:
     # * "Platform"-based sources (OS, toolkit, etc.)
     # * Feature/directory-based sources (e.g., history, printing)
 
@@ skipping 1367 matching lines @@
       'browser/ui/webui/signin/user_manager_screen_handler.h',
       'browser/ui/webui/signin/user_manager_ui.cc',
       'browser/ui/webui/signin/user_manager_ui.h',
     ],
     # Desktop Linux. Assume aura/ash/views/x11.
     'chrome_browser_ui_desktop_linux_sources': [
       'browser/ui/input_method/input_method_engine.cc',
       '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',
       'browser/ui/views/frame/browser_desktop_window_tree_host.h',
       'browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc',
       'browser/ui/views/frame/browser_desktop_window_tree_host_x11.h',
       'browser/ui/views/frame/desktop_browser_frame_auralinux.cc',
       'browser/ui/views/frame/desktop_browser_frame_auralinux.h',
       'browser/ui/views/frame/global_menu_bar_registrar_x11.cc',
       'browser/ui/views/frame/global_menu_bar_registrar_x11.h',
@@ skipping 679 matching lines @@
       'browser/ui/webui/system_info_ui.h',
       'browser/ui/webui/theme_handler.cc',
       'browser/ui/webui/theme_handler.h',
       'browser/ui/webui/uber/uber_ui.cc',
       'browser/ui/webui/uber/uber_ui.h',
       'browser/ui/window_sizer/window_sizer.cc',
       'browser/ui/window_sizer/window_sizer.h',
     ],
     # 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',
       'browser/ui/views/apps/app_info_dialog/app_info_footer_panel.h',
       'browser/ui/views/apps/app_info_dialog/app_info_header_panel.cc',
       'browser/ui/views/apps/app_info_dialog/app_info_header_panel.h',
       'browser/ui/views/apps/app_info_dialog/app_info_panel.cc',
       'browser/ui/views/apps/app_info_dialog/app_info_panel.h',
       'browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.cc',
       'browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.h',
@@ skipping 62 matching lines @@
       'browser/ui/views/frame/opaque_browser_frame_view_layout.h',
       'browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h',
       'browser/ui/views/frame/opaque_browser_frame_view_linux.cc',
       'browser/ui/views/frame/opaque_browser_frame_view_linux.h',
       'browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc',
       'browser/ui/views/frame/opaque_browser_frame_view_platform_specific.h',
       'browser/ui/views/screen_capture_notification_ui_views.cc',
       'browser/ui/views/sync/one_click_signin_dialog_view.cc',
       'browser/ui/views/sync/one_click_signin_dialog_view.h',
     ],
-    # Cross-platform (except Mac) views sources. We assume app list is enabled.
+    # Cross-platform (except Mac) views sources.
     'chrome_browser_ui_views_non_mac_sources': [
       'browser/ui/views/accelerator_utils_aura.cc',
       'browser/ui/views/accessibility/invert_bubble_view.cc',
       'browser/ui/views/accessibility/invert_bubble_view.h',
       'browser/ui/views/apps/app_window_desktop_native_widget_aura_win.cc',
       'browser/ui/views/apps/app_window_desktop_native_widget_aura_win.h',
       'browser/ui/views/apps/app_window_desktop_window_tree_host_win.cc',
       'browser/ui/views/apps/app_window_desktop_window_tree_host_win.h',
       'browser/ui/views/apps/app_window_easy_resize_window_targeter.cc',
       'browser/ui/views/apps/app_window_easy_resize_window_targeter.h',
@@ skipping 398 matching lines @@
     ],
     # Compiled for X11: desktop Linux and ChromeOS. We assume aura/views/ash.
     'chrome_browser_ui_x11_sources': [
       'browser/ui/views/javascript_app_modal_event_blocker_x11.cc',
       'browser/ui/views/javascript_app_modal_event_blocker_x11.h',
       'browser/ui/views/tabs/window_finder_x11.cc',
     ],
 
     ### Feature-based sources ###
     # Variables should generally be alphabetical within this section.
-
-    # Note that we assume app list is enabled on all views builds, so the
-    # views-specific app list files are in the views section.
     'chrome_browser_ui_app_list_sources': [
       'browser/ui/app_list/app_context_menu.cc',
       'browser/ui/app_list/app_context_menu.h',
       'browser/ui/app_list/app_context_menu_delegate.h',
       'browser/ui/app_list/app_list_controller_delegate.cc',
       'browser/ui/app_list/app_list_controller_delegate.h',
       'browser/ui/app_list/app_list_controller_delegate_impl.cc',
       'browser/ui/app_list/app_list_controller_delegate_impl.h',
       'browser/ui/app_list/app_list_model_builder.cc',
       'browser/ui/app_list/app_list_model_builder.h',
@@ skipping 88 matching lines @@
       'browser/ui/app_list/speech_auth_helper.cc',
       'browser/ui/app_list/speech_auth_helper.h',
       'browser/ui/app_list/speech_recognizer.cc',
       'browser/ui/app_list/speech_recognizer.h',
       'browser/ui/app_list/speech_recognizer_delegate.h',
       'browser/ui/app_list/start_page_observer.h',
       'browser/ui/app_list/start_page_service.cc',
       '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',
       'browser/ui/views/app_list/win/app_list_controller_delegate_win.h',
       'browser/ui/views/app_list/win/app_list_service_win.cc',
       'browser/ui/views/app_list/win/app_list_service_win.h',
       'browser/ui/views/app_list/win/app_list_win.cc',
       'browser/ui/views/app_list/win/app_list_win.h',
       'browser/ui/webui/app_list/start_page_handler.cc',
       'browser/ui/webui/app_list/start_page_handler.h',
       'browser/ui/webui/app_list/start_page_ui.cc',
       'browser/ui/webui/app_list/start_page_ui.h',
     ],
+    'chrome_browser_ui_app_list_linux_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',
+    ],
+    'chrome_browser_ui_app_list_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',
+    ],
     # Used when the app list is disabled.
     'chrome_browser_ui_non_app_list_sources': [
       'browser/ui/app_list/app_list_service_disabled.cc',
     ],
     # Autofill sources used everywhere autofill dialog is enabled.
     'chrome_browser_ui_autofill_dialog_sources': [
       'browser/ui/autofill/autofill_dialog_common.cc',
       'browser/ui/autofill/autofill_dialog_common.h',
     ],
     # Autofill sources used on desktop and ChromeOS.
@@ skipping 474 matching lines @@
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
           'dependencies': [
             'installer_util_strings',
             '../components/components.gyp:browser_watcher',
             '../components/components.gyp:search_engines',
             '../google_update/google_update.gyp:google_update',
             '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
             '../third_party/isimpledom/isimpledom.gyp:isimpledom',
-            '../ui/app_list/app_list.gyp:app_list',
             '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
             '../ui/events/events.gyp:dom_keycode_converter',
             '../ui/views/controls/webview/webview.gyp:webview',
             '../ui/views/views.gyp:views',
           ],
           'export_dependent_settings': [
             '../ui/views/controls/webview/webview.gyp:webview',
             '../ui/views/views.gyp:views',
           ],
           'sources': [ '<@(chrome_browser_ui_win_sources)' ],
           'sources!': [
             'browser/ui/views/apps/keyboard_hook_handler.cc',
             'browser/ui/views/frame/taskbar_decorator.cc'
           ],
           'conditions': [
             ['branding!="Chrome"', {
               'dependencies!': [
                 '../google_update/google_update.gyp:google_update',
               ],
               'sources!': [
                 'browser/ui/webui/help/version_updater_win.cc',
               ],
               'sources': [
                 'browser/ui/webui/help/version_updater_basic.cc',
                 'browser/ui/webui/help/version_updater_basic.h',
               ],
             }],
+            ['enable_app_list==1', {
+              'dependencies!': [
+                '../ui/app_list/app_list.gyp:app_list',
+              ],
+            }],
           ],
         }, {  # 'OS!="win"
           'conditions': [
             ['toolkit_views==1', {
               'dependencies': [
                 '../ui/views/controls/webview/webview.gyp:webview',
                 '../ui/views/views.gyp:views',
               ],
               'include_dirs': [
                 '<(INTERMEDIATE_DIR)',
@@ skipping 40 matching lines @@
                 '../device/udev_linux/udev.gyp:udev_linux',
               ],
             }],
           ],
         }],
         ['enable_app_list==1', {
           'sources': [ '<@(chrome_browser_ui_app_list_sources)' ],
           'dependencies': [
             '../ui/app_list/app_list.gyp:app_list',
           ],
+          'conditions': [
+            ['desktop_linux==1', {
+              'sources': [
+                '<@(chrome_browser_ui_app_list_linux_sources)',
+              ],
+            }],
+            ['OS!="mac"', {
+              'sources': [
+                '<@(chrome_browser_ui_app_list_views_sources)',
+              ],
+            }],
+          ],
         }, {
           'sources': [ '<@(chrome_browser_ui_non_app_list_sources)' ],
         }],
         ['enable_autofill_dialog==1', {
           'sources': [ '<@(chrome_browser_ui_autofill_dialog_sources)' ],
           'conditions': [
             ['OS!="android" and OS!="ios"', {
               'sources': [
                 '<@(chrome_browser_ui_autofill_dialog_non_mobile_sources)',
               ],
@@ skipping 55 matching lines @@
           ],
           'sources': [
             '<@(chrome_browser_ui_non_mobile_sources)',
             '<@(chrome_browser_ui_omnibox_non_mobile_sources)',
           ],
         }],
       ],
     },
   ],
 }