launcher: Switch from views/ to ash/.

BUG=125846
TBR=ben@chromium.org

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

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

chrome/browser/ui/ash/app_list/extension_app_item.cc

@@ -12,11 +12,11 @@
 #include "chrome/browser/extensions/management_policy.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/extension_utils.h"
+#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "grit/chromium_strings.h"

chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc

@@ -2,24 +2,24 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.h"
+#include "chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h"
 
 #include <map>
 #include <string>
 
 #include "ash/launcher/launcher_model.h"
 #include "base/memory/scoped_ptr.h"
+#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/tabs/test_tab_strip_model_delegate.h"
-#include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/activation_delegate.h"
+#include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_activation_client.h"
 #include "ui/aura/test/test_window_delegate.h"

chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc

@@ -6,10 +6,10 @@
 
 #include "base/file_path.h"
 #include "base/time.h"
+#include "chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h"
+#include "chrome/browser/ui/ash/launcher/launcher_favicon_loader.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
-#include "chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.h"
-#include "chrome/browser/ui/views/ash/launcher/launcher_favicon_loader.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/common/favicon_url.h"
 #include "chrome/common/icon_messages.h"

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

@@ -15,10 +15,10 @@
 #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/ash/launcher/chrome_launcher_controller.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/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/views/ash/user_action_handler.h"
 #include "chrome/browser/ui/views/ash/window_positioner.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"

chrome/browser/ui/views/frame/browser_view.cc

@@ -115,8 +115,8 @@
 #include "ash/launcher/launcher_model.h"
 #include "ash/shell.h"
 #include "chrome/browser/ui/ash/ash_util.h"
+#include "chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h"
 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
-#include "chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.h"
 #include "chrome/browser/ui/views/ash/window_positioner.h"
 #elif defined(OS_WIN) && !defined(USE_AURA)
 #include "base/win/metro.h"

chrome/chrome_browser.gypi

@@ -2483,6 +2483,18 @@
         'browser/ui/ash/ime_controller_chromeos.h',
         'browser/ui/ash/keyboard_brightness_controller_chromeos.cc',
         'browser/ui/ash/keyboard_brightness_controller_chromeos.h',
+        'browser/ui/ash/launcher/browser_launcher_item_controller.cc',
+        'browser/ui/ash/launcher/browser_launcher_item_controller.h',
+        'browser/ui/ash/launcher/chrome_launcher_controller.cc',
+        'browser/ui/ash/launcher/chrome_launcher_controller.h',
+        'browser/ui/ash/launcher/launcher_app_icon_loader.cc',
+        'browser/ui/ash/launcher/launcher_app_icon_loader.h',
+        'browser/ui/ash/launcher/launcher_app_tab_helper.cc',
+        'browser/ui/ash/launcher/launcher_app_tab_helper.h',
+        'browser/ui/ash/launcher/launcher_context_menu.cc',
+        'browser/ui/ash/launcher/launcher_context_menu.h',
+        'browser/ui/ash/launcher/launcher_favicon_loader.cc',
+        'browser/ui/ash/launcher/launcher_favicon_loader.h',
         'browser/ui/ash/screenshot_taker.cc',
         'browser/ui/ash/screenshot_taker.h',
         'browser/ui/ash/tabs/dock_info_ash.cc',
@@ -3560,18 +3572,6 @@
         'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h',
         'browser/ui/views/ash/chrome_shell_delegate.cc',
         'browser/ui/views/ash/chrome_shell_delegate.h',
-        'browser/ui/views/ash/launcher/browser_launcher_item_controller.cc',
-        'browser/ui/views/ash/launcher/browser_launcher_item_controller.h',
-        'browser/ui/views/ash/launcher/chrome_launcher_controller.cc',
-        'browser/ui/views/ash/launcher/chrome_launcher_controller.h',
-        'browser/ui/views/ash/launcher/launcher_app_icon_loader.cc',
-        'browser/ui/views/ash/launcher/launcher_app_icon_loader.h',
-        'browser/ui/views/ash/launcher/launcher_app_tab_helper.cc',
-        'browser/ui/views/ash/launcher/launcher_app_tab_helper.h',
-        'browser/ui/views/ash/launcher/launcher_context_menu.cc',
-        'browser/ui/views/ash/launcher/launcher_context_menu.h',
-        'browser/ui/views/ash/launcher/launcher_favicon_loader.cc',
-        'browser/ui/views/ash/launcher/launcher_favicon_loader.h',
         'browser/ui/views/ash/panel_view_aura.cc',
         'browser/ui/views/ash/panel_view_aura.h',
         'browser/ui/views/ash/user_action_handler.cc',

chrome/chrome_tests.gypi

@@ -1642,6 +1642,8 @@
         '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/ash/launcher/browser_launcher_item_controller_unittest.cc',
+        'browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc',
         'browser/ui/auto_login_prompter_unittest.cc',
         'browser/ui/browser_unittest.cc',
         'browser/ui/chrome_select_file_policy_unittest.cc',
@@ -1841,8 +1843,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/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',
         'browser/ui/views/bookmarks/bookmark_context_menu_test.cc',
         'browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc',
@@ -2914,6 +2914,8 @@
         'browser/task_manager/task_manager_notification_browsertest.cc',
         'browser/translate/translate_manager_browsertest.cc',
         'browser/ui/ash/caps_lock_handler_browsertest.cc',
+        'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc',
+        'browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc',
         'browser/ui/ash/volume_controller_browsertest_chromeos.cc',
         'browser/ui/browser_browsertest.cc',
         'browser/ui/browser_close_browsertest.cc',
@@ -2940,8 +2942,6 @@
         'browser/ui/tab_modal_confirm_dialog_browsertest.cc',
         'browser/ui/tab_modal_confirm_dialog_browsertest.h',
         'browser/ui/views/ash/browser_non_client_frame_view_ash_browsertest.cc',
-        'browser/ui/views/ash/launcher/chrome_launcher_controller_browsertest.cc',
-        'browser/ui/views/ash/launcher/launcher_favicon_loader_browsertest.cc',
         'browser/ui/views/browser_actions_container_browsertest.cc',
         'browser/ui/views/constrained_window_views_browsertest.cc',
         'browser/ui/views/frame/app_non_client_frame_view_aura_browsertest.cc',