Revert of Refactor views app list services to allow more code sharing

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 117 matching lines @@
         'browser/ui/android/toolbar/toolbar_model_android.cc',
         'browser/ui/android/toolbar/toolbar_model_android.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_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.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_controller_delegate_views.cc',
-        'browser/ui/app_list/app_list_controller_delegate_views.h',
+        'browser/ui/app_list/app_list_factory.h',
         'browser/ui/app_list/app_list_icon_win.cc',
         'browser/ui/app_list/app_list_icon_win.h',
         'browser/ui/app_list/app_list_positioner.cc',
         'browser/ui/app_list/app_list_positioner.h',
         'browser/ui/app_list/app_list_service.cc',
         'browser/ui/app_list/app_list_service.h',
         'browser/ui/app_list/app_list_service_disabled.cc',
         'browser/ui/app_list/app_list_service_impl.cc',
         'browser/ui/app_list/app_list_service_impl.h',
         'browser/ui/app_list/app_list_service_mac.h',
         'browser/ui/app_list/app_list_service_mac.mm',
-        '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_delegate.h',
-        'browser/ui/app_list/app_list_shower_views.cc',
-        'browser/ui/app_list/app_list_shower_views.h',
+        'browser/ui/app_list/app_list_shower.cc',
+        'browser/ui/app_list/app_list_shower.h',
         'browser/ui/app_list/app_list_syncable_service.cc',
         'browser/ui/app_list/app_list_syncable_service.h',
         'browser/ui/app_list/app_list_syncable_service_factory.cc',
         'browser/ui/app_list/app_list_syncable_service_factory.h',
         'browser/ui/app_list/app_list_util.cc',
         'browser/ui/app_list/app_list_util.h',
         'browser/ui/app_list/app_list_view_delegate.cc',
         'browser/ui/app_list/app_list_view_delegate.h',
         'browser/ui/app_list/chrome_signin_delegate.cc',
         'browser/ui/app_list/chrome_signin_delegate.h',
@@ skipping 1264 matching lines @@
         'browser/ui/unload_controller.h',
         'browser/ui/validation_message_bubble.h',
         'browser/ui/view_ids.h',
         'browser/ui/views/accelerator_utils_aura.cc',
         'browser/ui/views/accessibility/accessibility_event_router_views.cc',
         'browser/ui/views/accessibility/accessibility_event_router_views.h',
         'browser/ui/views/accessibility/invert_bubble_view.cc',
         'browser/ui/views/accessibility/invert_bubble_view.h',
         'browser/ui/views/accessibility/automation_manager_views.cc',
         'browser/ui/views/accessibility/automation_manager_views.h',
+        'browser/ui/views/app_list/linux/app_list_controller_delegate_linux.cc',
+        'browser/ui/views/app_list/linux/app_list_controller_delegate_linux.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/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',
@@ skipping 1697 matching lines @@
             'browser/ui/webui/local_discovery/local_discovery_ui.cc',
             'browser/ui/webui/local_discovery/local_discovery_ui.h',
             'browser/ui/webui/local_discovery/local_discovery_ui_handler.cc',
             'browser/ui/webui/local_discovery/local_discovery_ui_handler.h',
           ],
         }],
       ],
     },
   ],
 }