browser: Move some ash files into ui/ash.

BUG=125846
R=ben@chromium.org

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

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

chrome/browser/chromeos/input_method/mock_xkeyboard.h

@@ -44,7 +44,8 @@ class MockXKeyboard : public XKeyboard {
   DISALLOW_COPY_AND_ASSIGN(MockXKeyboard);
 };
 
-// TODO(yusukes): Use the mock in ui/views/ash/caps_lock_handler_browsertest.cc.
+// TODO(yusukes): Use the mock in
+// chrome/browser/ui/ash/caps_lock_handler_browsertest.cc.
 
 }  // namespace input_method
 }  // namespace chromeos

chrome/browser/ui/ash/ash_init.cc

@@ -14,14 +14,14 @@
 #include "base/command_line.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
-#include "chrome/browser/ui/views/ash/caps_lock_handler.h"
+#include "chrome/browser/ui/ash/caps_lock_handler.h"
 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
 #include "chrome/browser/ui/views/ash/key_rewriter.h"
 #include "chrome/browser/ui/views/ash/screenshot_taker.h"
 #include "chrome/common/chrome_switches.h"
 #include "ui/aura/aura_switches.h"
-#include "ui/aura/env.h"
 #include "ui/aura/display_manager.h"
+#include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/compositor/compositor_setup.h"
 
@@ -29,9 +29,9 @@
 #include "base/chromeos/chromeos_version.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
+#include "chrome/browser/ui/ash/volume_controller_chromeos.h"
 #include "chrome/browser/ui/views/ash/brightness_controller_chromeos.h"
 #include "chrome/browser/ui/views/ash/ime_controller_chromeos.h"
-#include "chrome/browser/ui/views/ash/volume_controller_chromeos.h"
 #endif
 
 

chrome/browser/ui/views/ash/caps_lock_handler.cc → chrome/browser/ui/ash/caps_lock_handler.cc

@@ -2,7 +2,7 @@
 // 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/caps_lock_handler.h"
+#include "chrome/browser/ui/ash/caps_lock_handler.h"
 
 #include "base/logging.h"
 #include "content/public/browser/browser_thread.h"

chrome/browser/ui/views/ash/caps_lock_handler.h → chrome/browser/ui/ash/caps_lock_handler.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_VIEWS_ASH_CAPS_LOCK_HANDLER_H_
-#define CHROME_BROWSER_UI_VIEWS_ASH_CAPS_LOCK_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_ASH_CAPS_LOCK_HANDLER_H_
+#define CHROME_BROWSER_UI_ASH_CAPS_LOCK_HANDLER_H_
 
 #include "ash/caps_lock_delegate.h"
 #include "base/basictypes.h"
@@ -58,4 +58,4 @@ class CapsLockHandler : public ash::CapsLockDelegate
   DISALLOW_COPY_AND_ASSIGN(CapsLockHandler);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_ASH_CAPS_LOCK_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_ASH_CAPS_LOCK_HANDLER_H_

chrome/browser/ui/views/ash/caps_lock_handler_browsertest.cc → chrome/browser/ui/ash/caps_lock_handler_browsertest.cc

@@ -2,7 +2,8 @@
 // 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/caps_lock_handler.h"
+#include "chrome/browser/ui/ash/caps_lock_handler.h"
+
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 

chrome/browser/ui/views/ash/volume_controller_browsertest_chromeos.cc → chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc

@@ -2,7 +2,7 @@
 // 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/volume_controller_chromeos.h"
+#include "chrome/browser/ui/ash/volume_controller_chromeos.h"
 
 #include "chrome/browser/chromeos/audio/audio_handler.h"
 #include "chrome/browser/chromeos/audio/audio_mixer.h"

chrome/browser/ui/views/ash/volume_controller_chromeos.cc → chrome/browser/ui/ash/volume_controller_chromeos.cc

@@ -2,7 +2,7 @@
 // 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/volume_controller_chromeos.h"
+#include "chrome/browser/ui/ash/volume_controller_chromeos.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/audio/audio_handler.h"

chrome/browser/ui/views/ash/volume_controller_chromeos.h → chrome/browser/ui/ash/volume_controller_chromeos.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_VIEWS_ASH_VOLUME_CONTROLLER_CHROMEOS_H_
-#define CHROME_BROWSER_UI_VIEWS_ASH_VOLUME_CONTROLLER_CHROMEOS_H_
+#ifndef CHROME_BROWSER_UI_ASH_VOLUME_CONTROLLER_CHROMEOS_H_
+#define CHROME_BROWSER_UI_ASH_VOLUME_CONTROLLER_CHROMEOS_H_
 
 #include "ash/volume_control_delegate.h"
 #include "base/basictypes.h"
@@ -26,4 +26,4 @@ class VolumeController : public ash::VolumeControlDelegate {
   DISALLOW_COPY_AND_ASSIGN(VolumeController);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_ASH_VOLUME_CONTROLLER_CHROMEOS_H_
+#endif  // CHROME_BROWSER_UI_ASH_VOLUME_CONTROLLER_CHROMEOS_H_

chrome/chrome_browser.gypi

@@ -2382,9 +2382,13 @@
         'browser/ui/ash/ash_init.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/chrome_launcher_prefs.cc',
         'browser/ui/ash/chrome_launcher_prefs.h',
         'browser/ui/ash/tabs/dock_info_ash.cc',
+        'browser/ui/ash/volume_controller_chromeos.cc',
+        'browser/ui/ash/volume_controller_chromeos.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',
@@ -3461,8 +3465,6 @@
         'browser/ui/views/ash/brightness_controller_chromeos.h',
         'browser/ui/views/ash/browser_non_client_frame_view_ash.h',
         'browser/ui/views/ash/browser_non_client_frame_view_ash.cc',
-        'browser/ui/views/ash/caps_lock_handler.cc',
-        'browser/ui/views/ash/caps_lock_handler.h',
         'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc',
         'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h',
         'browser/ui/views/ash/chrome_shell_delegate.cc',
@@ -3489,8 +3491,6 @@
         'browser/ui/views/ash/screenshot_taker.h',
         'browser/ui/views/ash/user_action_handler.cc',
         'browser/ui/views/ash/user_action_handler.h',
-        'browser/ui/views/ash/volume_controller_chromeos.cc',
-        'browser/ui/views/ash/volume_controller_chromeos.h',
         'browser/ui/views/ash/window_positioner.cc',
         'browser/ui/views/ash/window_positioner.h',
         'browser/ui/views/avatar_menu_bubble_view.cc',

chrome/chrome_tests.gypi

@@ -2901,6 +2901,8 @@
         'browser/task_manager/task_manager_browsertest_util.h',
         '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/volume_controller_browsertest_chromeos.cc',
         'browser/ui/browser_browsertest.cc',
         'browser/ui/browser_close_browsertest.cc',
         'browser/ui/browser_navigator_browsertest.cc',
@@ -2926,10 +2928,8 @@
         '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/caps_lock_handler_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/ash/volume_controller_browsertest_chromeos.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',