Use app_list_service_disabled in Athena

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': {
     'chrome_browser_ui_non_ios_sources': [
       'browser/ui/accelerator_utils.h',
       'browser/ui/android/android_about_app_info.cc',
       'browser/ui/android/android_about_app_info.h',
@@ skipping 1849 matching lines @@
       'browser/ui/views/apps/app_window_desktop_window_tree_host_win.h',
       'browser/ui/views/apps/chrome_apps_client_views_win.cc',
       'browser/ui/views/apps/chrome_native_app_window_views.cc',
       'browser/ui/views/apps/chrome_native_app_window_views.h',
       'browser/ui/views/apps/chrome_native_app_window_views_win.cc',
       'browser/ui/views/apps/chrome_native_app_window_views_win.h',
       'browser/ui/views/apps/glass_app_window_frame_view_win.cc',
       'browser/ui/views/apps/glass_app_window_frame_view_win.h',
       'browser/ui/views/apps/shaped_app_window_targeter.cc',
       'browser/ui/views/apps/shaped_app_window_targeter.h',
-      'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc',
-      'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h',
       'browser/ui/views/ash/tab_scrubber.cc',
       'browser/ui/views/ash/tab_scrubber.h',
       'browser/ui/views/autofill/autofill_dialog_views.cc',
       'browser/ui/views/autofill/autofill_dialog_views.h',
       'browser/ui/views/autofill/autofill_popup_base_view.cc',
       'browser/ui/views/autofill/autofill_popup_base_view.h',
       'browser/ui/views/autofill/autofill_popup_view_views.cc',
       'browser/ui/views/autofill/autofill_popup_view_views.h',
       'browser/ui/views/autofill/decorated_textfield.cc',
       'browser/ui/views/autofill/decorated_textfield.h',
@@ skipping 436 matching lines @@
     # Cross-platform ash sources.
     'chrome_browser_ui_ash_sources': [
       'browser/ui/ash/accessibility/automation_manager_ash.cc',
       'browser/ui/ash/accessibility/automation_manager_ash.h',
       'browser/ui/ash/accessibility/ax_root_obj_wrapper.cc',
       'browser/ui/ash/accessibility/ax_root_obj_wrapper.h',
       'browser/ui/ash/accessibility/ax_tree_source_ash.cc',
       'browser/ui/ash/accessibility/ax_tree_source_ash.h',
       'browser/ui/ash/ash_keyboard_controller_proxy.cc',
       'browser/ui/ash/ash_keyboard_controller_proxy.h',
-      'browser/ui/ash/app_list/app_list_controller_ash.cc',
-      'browser/ui/ash/app_list/app_list_controller_ash.h',
-      'browser/ui/ash/app_list/app_list_service_ash.cc',
-      'browser/ui/ash/app_list/app_list_service_ash.h',
       'browser/ui/ash/app_list/app_sync_ui_state_watcher.cc',
       'browser/ui/ash/app_list/app_sync_ui_state_watcher.h',
       'browser/ui/ash/app_sync_ui_state.cc',
       'browser/ui/ash/app_sync_ui_state.h',
       'browser/ui/ash/app_sync_ui_state_observer.h',
       'browser/ui/ash/app_sync_ui_state_factory.cc',
       'browser/ui/ash/app_sync_ui_state_factory.h',
-      'browser/ui/ash/ash_init.cc',
-      'browser/ui/ash/ash_init.h',
       'browser/ui/ash/ash_util.cc',
       'browser/ui/ash/ash_util.h',
       'browser/ui/ash/chrome_launcher_prefs.cc',
       'browser/ui/ash/chrome_launcher_prefs.h',
       'browser/ui/ash/chrome_new_window_delegate.cc',
       'browser/ui/ash/chrome_new_window_delegate.h',
       'browser/ui/ash/chrome_new_window_delegate_chromeos.cc',
       'browser/ui/ash/chrome_new_window_delegate_chromeos.h',
       'browser/ui/ash/chrome_shell_delegate.cc',
       'browser/ui/ash/chrome_shell_delegate.h',
@@ skipping 87 matching lines @@
       'browser/ui/views/frame/browser_header_painter_ash.cc',
       'browser/ui/views/frame/browser_header_painter_ash.h',
       'browser/ui/views/frame/browser_non_client_frame_view_ash.cc',
       'browser/ui/views/frame/browser_non_client_frame_view_ash.h',
       'browser/ui/views/frame/immersive_mode_controller_ash.cc',
       'browser/ui/views/frame/immersive_mode_controller_ash.h',
       'browser/ui/views/frame/scroll_end_effect_controller_ash.cc',
       'browser/ui/views/frame/scroll_end_effect_controller_ash.h',
       'browser/ui/views/tabs/window_finder_ash.cc',
     ],
+    # Used when Ash is enabled but not Athena.
+    'chrome_browser_ui_ash_non_athena_sources': [
+      'browser/ui/ash/ash_init.cc',
+      'browser/ui/ash/ash_init.h',
+      'browser/ui/ash/app_list/app_list_controller_ash.cc',
+      'browser/ui/ash/app_list/app_list_controller_ash.h',
+      'browser/ui/ash/app_list/app_list_service_ash.cc',
+      'browser/ui/ash/app_list/app_list_service_ash.h',
+      'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc',
+      'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h',
+    ],
     # Used when Ash is enabled but not ChromeOS.
     'chrome_browser_ui_ash_non_chromeos': [
       'browser/ui/ash/chrome_shell_delegate_views.cc',
       'browser/ui/ash/multi_user/multi_user_context_menu.cc',
       'browser/ui/ash/multi_user/multi_user_context_menu.h',
       'browser/ui/ash/session_state_delegate_views.cc',
       'browser/ui/ash/session_state_delegate_views.h',
     ],
     # Used when athena is enabled.
     'chrome_browser_ui_athena_sources': [
+      #TODO(mukai): Port AppListService to Athena (crbug.com/417571)
+      'browser/ui/app_list/app_list_service_disabled.cc',
+
       'browser/ui/views/athena/athena_util.cc',
       'browser/ui/views/athena/athena_util.h',
       'browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc',
       'browser/ui/views/athena/chrome_browser_main_extra_parts_athena.h',
     ],
     # Counts desktop Linux and ChromeOS.
     'chrome_browser_ui_linux_sources': [
       'browser/ui/startup/autolaunch_prompt.cc',
       'browser/ui/views/apps/chrome_apps_client_views.cc',
       'browser/ui/views/frame/taskbar_decorator.cc',
@@ skipping 249 matching lines @@
         }],
         ['use_athena==1', {
           'defines': ['USE_ATHENA=1'],
           'sources': [ '<@(chrome_browser_ui_athena_sources)' ],
           'dependencies': [
             '<(DEPTH)/athena/athena.gyp:athena_lib',
             '<(DEPTH)/athena/athena.gyp:athena_chrome_lib',
             '<(DEPTH)/athena/athena.gyp:athena_content_lib',
             '<(DEPTH)/athena/main/athena_main.gyp:athena_main_lib',
           ],
+        }, { # use_athena==0
+          'conditions': [
+            ['use_ash==1', {
+              'sources': [ '<@(chrome_browser_ui_ash_non_athena_sources)' ],
+            }],
+          ],
         }],
         ['toolkit_views==1', {
           'sources': [ '<@(chrome_browser_ui_views_sources)' ],
           'conditions': [
             ['chromeos == 0 and OS!="mac"', {
               'sources': [ '<@(chrome_browser_ui_views_non_chromeos_sources)' ],
             }],
             ['use_ash == 1', {
               'sources': [ '<@(chrome_browser_ui_ash_views_sources)' ],
             }],
@@ skipping 257 matching lines @@
         }],
         ['OS!="android" and OS!="ios"', {
           'dependencies': [
             '../device/bluetooth/bluetooth.gyp:device_bluetooth',
           ],
         }],
       ],
     },
   ],
 }