Move common app_list delegate code to chrome/browser/ui/app_list.

chrome/chrome_browser.gypi

 # Copyright (c) 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',
       'type': 'static_library',
@@ skipping 2477 matching lines @@
         '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_creator.cc',
         'browser/ui/app_modal_dialogs/javascript_dialog_creator.h',
         'browser/ui/app_modal_dialogs/native_app_modal_dialog.h',
         'browser/ui/ash/ash_init.cc',
         'browser/ui/ash/ash_init.h',
-        'browser/ui/ash/app_list/app_list_controller.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_view_delegate.cc',
-        'browser/ui/ash/app_list/app_list_view_delegate.h',
-        'browser/ui/ash/app_list/apps_model_builder.cc',
-        'browser/ui/ash/app_list/apps_model_builder.h',
-        'browser/ui/ash/app_list/chrome_app_list_item.h',
-        'browser/ui/ash/app_list/extension_app_item.cc',
-        'browser/ui/ash/app_list/extension_app_item.h',
-        'browser/ui/ash/app_list/search_builder.cc',
-        'browser/ui/ash/app_list/search_builder.h',
         'browser/ui/ash/ash_util.cc',
         'browser/ui/ash/ash_util.h',
         'browser/ui/ash/caps_lock_handler.cc',
         'browser/ui/ash/caps_lock_handler.h',
         'browser/ui/ash/brightness_controller_chromeos.cc',
         'browser/ui/ash/brightness_controller_chromeos.h',
         'browser/ui/ash/chrome_launcher_prefs.cc',
         'browser/ui/ash/chrome_launcher_prefs.h',
         'browser/ui/ash/chrome_shell_delegate.cc',
         'browser/ui/ash/chrome_shell_delegate.h',
@@ skipping 2232 matching lines @@
             'browser/ui/gtk/gconf_titlebar_listener.h',
           ],
         }],
         ['use_gnome_keyring==0', {
           'sources!': [
             'browser/password_manager/native_backend_gnome_x.cc',
             'browser/password_manager/native_backend_gnome_x.h',
           ],
         }],
         ['use_ash==1', {
+          'sources': [
+            'browser/ui/app_list/app_list_controller.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/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',
+          ],
           'dependencies': [
             '../ash/ash.gyp:ash',
             '../ash/ash_strings.gyp:ash_strings',
             '../ui/app_list/app_list.gyp:app_list',
           ],
         }],
         ['use_aura==1 and use_ash==0 and OS=="linux"', {
           'dependencies': [
             # gtk2 is the only component that can interact with gtk2 in our new
             # world.
@@ skipping 875 matching lines @@
           'includes': [ '../build/jni_generator.gypi' ],
           'dependencies': [
             'android_jar_jni_headers',
           ],
         },
       ],
      },
     ],
   ],
 }