chrome: Switch more files from views/ to ash/.

BUG=125846
TBR=ben@chromium.org

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

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

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

@@ -19,8 +19,8 @@
 #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/user_action_handler.h"
-#include "chrome/browser/ui/views/ash/window_positioner.h"
+#include "chrome/browser/ui/ash/user_action_handler.h"
+#include "chrome/browser/ui/ash/window_positioner.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h"
 #include "chrome/common/chrome_notification_types.h"

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

@@ -119,7 +119,7 @@
 #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/window_positioner.h"
+#include "chrome/browser/ui/ash/window_positioner.h"
 #elif defined(OS_WIN) && !defined(USE_AURA)
 #include "base/win/metro.h"
 #include "chrome/browser/jumplist_win.h"

chrome/chrome_browser.gypi

@@ -2497,8 +2497,12 @@
         'browser/ui/ash/screenshot_taker.cc',
         'browser/ui/ash/screenshot_taker.h',
         'browser/ui/ash/tabs/dock_info_ash.cc',
+        'browser/ui/ash/user_action_handler.cc',
+        'browser/ui/ash/user_action_handler.h',
         'browser/ui/ash/volume_controller_chromeos.cc',
         'browser/ui/ash/volume_controller_chromeos.h',
+        'browser/ui/ash/window_positioner.cc',
+        'browser/ui/ash/window_positioner.h',
         'browser/ui/aura/chrome_browser_main_extra_parts_aura.cc',
         'browser/ui/aura/chrome_browser_main_extra_parts_aura.h',
         'browser/ui/aura/tabs/dock_info_aurax11.cc',
@@ -3573,10 +3577,6 @@
         'browser/ui/views/ash/chrome_shell_delegate.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',
-        'browser/ui/views/ash/user_action_handler.h',
-        'browser/ui/views/ash/window_positioner.cc',
-        'browser/ui/views/ash/window_positioner.h',
         'browser/ui/views/avatar_menu_bubble_view.cc',
         'browser/ui/views/avatar_menu_bubble_view.h',
         'browser/ui/views/avatar_menu_button.cc',

chrome/chrome_tests.gypi

@@ -1644,6 +1644,7 @@
         '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/ash/window_positioner_unittest.cc',
         'browser/ui/auto_login_prompter_unittest.cc',
         'browser/ui/browser_unittest.cc',
         'browser/ui/chrome_select_file_policy_unittest.cc',
@@ -1843,7 +1844,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/window_positioner_unittest.cc',
         'browser/ui/views/bookmarks/bookmark_context_menu_test.cc',
         'browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc',
         'browser/ui/views/crypto_module_password_dialog_view_unittest.cc',