Refactor app_list_util.h into AppListService abstract base.

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.
 
 {
   'targets': [
     {
       'target_name': 'browser_ui',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 45 matching lines @@
       'include_dirs': [
         '..',
         '<(INTERMEDIATE_DIR)',
         # Needed by pepper_flash_component_installer.cc.
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'export_dependent_settings': [
         '../sync/sync.gyp:sync',
       ],
       'sources': [
         # All .cc, .h, .m, and .mm files under browser/ui except for:

[tapted, 2013/02/19 04:25:21]

buut

         # * tests and mocks.
         'browser/ui/alternate_error_tab_observer.cc',
         'browser/ui/alternate_error_tab_observer.h',
         'browser/ui/android/android_about_app_info.cc',
         'browser/ui/android/android_about_app_info.h',
         'browser/ui/android/autofill/autofill_popup_view_android.cc',
         'browser/ui/android/autofill/autofill_popup_view_android.h',
         'browser/ui/android/certificate_viewer_android.cc',
         'browser/ui/android/chrome_http_auth_handler.cc',
         'browser/ui/android/chrome_http_auth_handler.h',
@@ skipping 16 matching lines @@
         'browser/ui/android/tab_model/tab_model.h',
         'browser/ui/android/tab_model/tab_model_list.cc',
         'browser/ui/android/tab_model/tab_model_list.h',
         'browser/ui/android/tab_restore_service_delegate_android.cc',
         'browser/ui/android/website_settings_popup_android.cc',
         'browser/ui/android/website_settings_popup_android.h',
         'browser/ui/android/window_android_helper.cc',
         'browser/ui/android/window_android_helper.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_util.cc',
-        'browser/ui/app_list/app_list_util.h',
+        'browser/ui/app_list/app_list_service.cc',
+        'browser/ui/app_list/app_list_service.h',
+        'browser/ui/app_list/app_list_service_ash.h',
+        'browser/ui/app_list/app_list_service_cocoa.h',
+        'browser/ui/app_list/app_list_service_disabled.cc',

[benwells, 2013/02/19 03:49:42]

You don't really need the _disabled.cc here, which will mean you don't need to
exclude it later. But maybe that is more confusing.

[tapted, 2013/02/19 04:25:21]

There's a "buut" on line 66 ;)

+        'browser/ui/app_list/app_list_service_selector.cc',
+        'browser/ui/app_list/app_list_service_win.h',
         'browser/ui/app_list/app_list_view_delegate.cc',
         'browser/ui/app_list/app_list_view_delegate.h',
         'browser/ui/app_list/apps_model_builder.cc',
         'browser/ui/app_list/apps_model_builder.h',
         'browser/ui/app_list/chrome_app_list_item.h',
         'browser/ui/app_list/chrome_signin_delegate.cc',
         'browser/ui/app_list/chrome_signin_delegate.h',
         'browser/ui/app_list/extension_app_item.cc',
         'browser/ui/app_list/extension_app_item.h',
         'browser/ui/app_list/search_builder.cc',
         'browser/ui/app_list/search_builder.h',
         'browser/ui/app_modal_dialogs/app_modal_dialog.cc',
         'browser/ui/app_modal_dialogs/app_modal_dialog.h',
         'browser/ui/app_modal_dialogs/app_modal_dialog_queue.cc',
         'browser/ui/app_modal_dialogs/app_modal_dialog_queue.h',
         'browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc',
         'browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h',
         'browser/ui/app_modal_dialogs/javascript_dialog_manager.cc',
         'browser/ui/app_modal_dialogs/javascript_dialog_manager.h',
         'browser/ui/app_modal_dialogs/native_app_modal_dialog.h',
         'browser/ui/ash/app_icon_loader.h',
         'browser/ui/ash/app_icon_loader_impl.cc',
         'browser/ui/ash/app_icon_loader_impl.h',
         'browser/ui/ash/app_list/app_list_controller_ash.h',
         'browser/ui/ash/app_list/app_list_controller_ash.cc',
+        'browser/ui/ash/app_list/app_list_service_ash.cc',
         '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',
@@ skipping 2671 matching lines @@
             ['exclude', '^browser/ui/views/select_file_dialog_extension.cc'],
             ['exclude', '^browser/ui/views/select_file_dialog_extension.h'],
             ['exclude', '^browser/ui/views/select_file_dialog_extension_factory.cc'],
             ['exclude', '^browser/ui/views/select_file_dialog_extension_factory.h'],
           ]}
         ],
         ['enable_app_list==1', {
           'dependencies': [
             '../ui/app_list/app_list.gyp:app_list',
           ],
+          'sources!': [
+            'browser/ui/app_list/app_list_service_disabled.cc',
+          ]
         }, { # else: enable_app_list==0
           'sources/': [
             ['exclude', '^browser/ui/views/app_list/'],
             ['exclude', '^browser/ui/app_list/'],
+            ['include', '^browser/ui/app_list/app_list_service.h'],
+            ['include', '^browser/ui/app_list/app_list_service.cc'],
+            ['include', '^browser/ui/app_list/app_list_service_disabled.cc'],
           ]
         }],
         ['enable_message_center==1', {
           'dependencies': [
             '../ui/message_center/message_center.gyp:message_center',
           ],
         }],
       ],
     },
   ],
 }