chrome: Switch to ui/ash/app_list.

BUG=125846
TBR=ben@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10854002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150057 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/views/ash/chrome_shell_delegate.cc

@@ -14,10 +14,10 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
+#include "chrome/browser/ui/ash/app_list/app_list_view_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
-#include "chrome/browser/ui/views/ash/app_list/app_list_view_delegate.h"
 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/views/ash/user_action_handler.h"
 #include "chrome/browser/ui/views/ash/window_positioner.h"

chrome/chrome_browser.gypi

@@ -2436,6 +2436,15 @@
         '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_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',
@@ -3515,15 +3524,6 @@
         'browser/ui/views/accessibility/invert_bubble_view.h',
         'browser/ui/views/app_menu_button_win.cc',
         'browser/ui/views/app_menu_button_win.h',
-        'browser/ui/views/ash/app_list/app_list_view_delegate.cc',
-        'browser/ui/views/ash/app_list/app_list_view_delegate.h',
-        'browser/ui/views/ash/app_list/apps_model_builder.cc',
-        'browser/ui/views/ash/app_list/apps_model_builder.h',
-        'browser/ui/views/ash/app_list/chrome_app_list_item.h',
-        'browser/ui/views/ash/app_list/extension_app_item.cc',
-        'browser/ui/views/ash/app_list/extension_app_item.h',
-        'browser/ui/views/ash/app_list/search_builder.cc',
-        'browser/ui/views/ash/app_list/search_builder.h',
         'browser/ui/views/ash/balloon_collection_impl_ash.cc',
         'browser/ui/views/ash/balloon_collection_impl_ash.h',
         'browser/ui/views/ash/balloon_view_ash.cc',

chrome/chrome_tests.gypi

@@ -1634,6 +1634,7 @@
         'browser/task_profiler/task_profiler_data_serializer_unittest.cc',
         'browser/themes/browser_theme_pack_unittest.cc',
         'browser/themes/theme_service_unittest.cc',
+        'browser/ui/ash/app_list/apps_model_builder_unittest.cc',
         'browser/ui/ash/event_rewriter_unittest.cc',
         'browser/ui/ash/ime_controller_chromeos_unittest.cc',
         'browser/ui/auto_login_prompter_unittest.cc',
@@ -1835,7 +1836,6 @@
         'browser/ui/toolbar/wrench_menu_model_unittest.cc',
         'browser/ui/views/accelerator_table_unittest.cc',
         'browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc',
-        'browser/ui/views/ash/app_list/apps_model_builder_unittest.cc',
         'browser/ui/views/ash/launcher/browser_launcher_item_controller_unittest.cc',
         'browser/ui/views/ash/launcher/chrome_launcher_controller_unittest.cc',
         'browser/ui/views/ash/window_positioner_unittest.cc',