browser: Move the other four files into ui/ash directory.

BUG=125846
TEST=./tools/checkdeps/checkdeps.py should still succeed.
R=ben@chromium.org

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

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

13 files changed, 36 insertions, 34 deletions

diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc
index f1b3ac0..8ce2812 100644
--- a/chrome/browser/ui/ash/ash_init.cc
+++ b/chrome/browser/ui/ash/ash_init.cc
@@ -15,9 +15,9 @@
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/ui/ash/caps_lock_handler.h"
+#include "chrome/browser/ui/ash/event_rewriter.h"
+#include "chrome/browser/ui/ash/screenshot_taker.h"
 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
-#include "chrome/browser/ui/views/ash/event_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/display_manager.h"
@@ -30,8 +30,8 @@
 #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/ash/brightness_controller_chromeos.h"
+#include "chrome/browser/ui/ash/ime_controller_chromeos.h"
 #endif
 
 
diff --git a/chrome/browser/ui/views/ash/brightness_controller_chromeos.cc b/chrome/browser/ui/ash/brightness_controller_chromeos.cc
index 9099445..36e9762 100644
--- a/chrome/browser/ui/views/ash/brightness_controller_chromeos.cc
+++ b/chrome/browser/ui/ash/brightness_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/brightness_controller_chromeos.h"
+#include "chrome/browser/ui/ash/brightness_controller_chromeos.h"
 
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
diff --git a/chrome/browser/ui/views/ash/brightness_controller_chromeos.h b/chrome/browser/ui/ash/brightness_controller_chromeos.h
index 645cffc..978b638 100644
--- a/chrome/browser/ui/views/ash/brightness_controller_chromeos.h
+++ b/chrome/browser/ui/ash/brightness_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_BRIGHTNESS_CONTROLLER_CHROMEOS_H_
-#define CHROME_BROWSER_UI_VIEWS_ASH_BRIGHTNESS_CONTROLLER_CHROMEOS_H_
+#ifndef CHROME_BROWSER_UI_ASH_BRIGHTNESS_CONTROLLER_CHROMEOS_H_
+#define CHROME_BROWSER_UI_ASH_BRIGHTNESS_CONTROLLER_CHROMEOS_H_
 
 #include "ash/system/brightness/brightness_control_delegate.h"
 #include "base/basictypes.h"
@@ -28,4 +28,4 @@ class BrightnessController : public ash::BrightnessControlDelegate {
   DISALLOW_COPY_AND_ASSIGN(BrightnessController);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_ASH_BRIGHTNESS_CONTROLLER_CHROMEOS_H_
+#endif  // CHROME_BROWSER_UI_ASH_BRIGHTNESS_CONTROLLER_CHROMEOS_H_
diff --git a/chrome/browser/ui/views/ash/event_rewriter.cc b/chrome/browser/ui/ash/event_rewriter.cc
index 0cb34ab..d1e226d 100644
--- a/chrome/browser/ui/views/ash/event_rewriter.cc
+++ b/chrome/browser/ui/ash/event_rewriter.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/event_rewriter.h"
+#include "chrome/browser/ui/ash/event_rewriter.h"
 
 #include <vector>
 
diff --git a/chrome/browser/ui/views/ash/event_rewriter.h b/chrome/browser/ui/ash/event_rewriter.h
index c092a3e..1e8f0d8 100644
--- a/chrome/browser/ui/views/ash/event_rewriter.h
+++ b/chrome/browser/ui/ash/event_rewriter.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_EVENT_REWRITER_H_
-#define CHROME_BROWSER_UI_VIEWS_ASH_EVENT_REWRITER_H_
+#ifndef CHROME_BROWSER_UI_ASH_EVENT_REWRITER_H_
+#define CHROME_BROWSER_UI_ASH_EVENT_REWRITER_H_
 
 #include <map>
 #include <string>
@@ -176,4 +176,4 @@ class EventRewriter : public ash::EventRewriterDelegate,
   DISALLOW_COPY_AND_ASSIGN(EventRewriter);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_ASH_EVENT_REWRITER_H_
+#endif  // CHROME_BROWSER_UI_ASH_EVENT_REWRITER_H_
diff --git a/chrome/browser/ui/views/ash/event_rewriter_unittest.cc b/chrome/browser/ui/ash/event_rewriter_unittest.cc
index b19a03b0..d909f4e 100644
--- a/chrome/browser/ui/views/ash/event_rewriter_unittest.cc
+++ b/chrome/browser/ui/ash/event_rewriter_unittest.cc
@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/browser/ui/ash/event_rewriter.h"
+
 #include "base/basictypes.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/prefs/pref_member.h"
-#include "chrome/browser/ui/views/ash/event_rewriter.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ui/views/ash/ime_controller_chromeos.cc b/chrome/browser/ui/ash/ime_controller_chromeos.cc
index 8f26aac..480d4af 100644
--- a/chrome/browser/ui/views/ash/ime_controller_chromeos.cc
+++ b/chrome/browser/ui/ash/ime_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/ime_controller_chromeos.h"
+#include "chrome/browser/ui/ash/ime_controller_chromeos.h"
 
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "ui/base/accelerators/accelerator.h"
diff --git a/chrome/browser/ui/views/ash/ime_controller_chromeos.h b/chrome/browser/ui/ash/ime_controller_chromeos.h
index 5163619..e0f2e64 100644
--- a/chrome/browser/ui/views/ash/ime_controller_chromeos.h
+++ b/chrome/browser/ui/ash/ime_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_IME_CONTROLLER_CHROMEOS_H_
-#define CHROME_BROWSER_UI_VIEWS_ASH_IME_CONTROLLER_CHROMEOS_H_
+#ifndef CHROME_BROWSER_UI_ASH_IME_CONTROLLER_CHROMEOS_H_
+#define CHROME_BROWSER_UI_ASH_IME_CONTROLLER_CHROMEOS_H_
 
 #include "ash/ime_control_delegate.h"
 #include "base/basictypes.h"
@@ -29,4 +29,4 @@ class ImeController : public ash::ImeControlDelegate {
   DISALLOW_COPY_AND_ASSIGN(ImeController);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_ASH_IME_CONTROLLER_CHROMEOS_H_
+#endif  // CHROME_BROWSER_UI_ASH_IME_CONTROLLER_CHROMEOS_H_
diff --git a/chrome/browser/ui/views/ash/ime_controller_chromeos_unittest.cc b/chrome/browser/ui/ash/ime_controller_chromeos_unittest.cc
index 30d2ae9..bdf2ac2 100644
--- a/chrome/browser/ui/views/ash/ime_controller_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/ime_controller_chromeos_unittest.cc
@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/browser/ui/ash/ime_controller_chromeos.h"
+
 #include "base/basictypes.h"
 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
-#include "chrome/browser/ui/views/ash/ime_controller_chromeos.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/events.h"
diff --git a/chrome/browser/ui/views/ash/screenshot_taker.cc b/chrome/browser/ui/ash/screenshot_taker.cc
index 9549e2c..12e6bd2 100644
--- a/chrome/browser/ui/views/ash/screenshot_taker.cc
+++ b/chrome/browser/ui/ash/screenshot_taker.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/screenshot_taker.h"
+#include "chrome/browser/ui/ash/screenshot_taker.h"
 
 #include <climits>
 #include <string>
diff --git a/chrome/browser/ui/views/ash/screenshot_taker.h b/chrome/browser/ui/ash/screenshot_taker.h
index 4262f27..e0540c2 100644
--- a/chrome/browser/ui/views/ash/screenshot_taker.h
+++ b/chrome/browser/ui/ash/screenshot_taker.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_SCREENSHOT_TAKER_H_
-#define CHROME_BROWSER_UI_VIEWS_ASH_SCREENSHOT_TAKER_H_
+#ifndef CHROME_BROWSER_UI_ASH_SCREENSHOT_TAKER_H_
+#define CHROME_BROWSER_UI_ASH_SCREENSHOT_TAKER_H_
 
 #include "ash/screenshot_delegate.h"
 #include "base/basictypes.h"
@@ -37,4 +37,4 @@ class ScreenshotTaker : public ash::ScreenshotDelegate {
   DISALLOW_COPY_AND_ASSIGN(ScreenshotTaker);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_ASH_SCREENSHOT_TAKER_H_
+#endif  // CHROME_BROWSER_UI_ASH_SCREENSHOT_TAKER_H_
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index fea8d1f..fd1dece 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2386,8 +2386,16 @@
         '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/event_rewriter.cc',
+        'browser/ui/ash/event_rewriter.h',
+        'browser/ui/ash/ime_controller_chromeos.cc',
+        'browser/ui/ash/ime_controller_chromeos.h',
+        'browser/ui/ash/screenshot_taker.cc',
+        'browser/ui/ash/screenshot_taker.h',
         'browser/ui/ash/tabs/dock_info_ash.cc',
         'browser/ui/ash/volume_controller_chromeos.cc',
         'browser/ui/ash/volume_controller_chromeos.h',
@@ -3467,20 +3475,14 @@
         'browser/ui/views/ash/balloon_collection_impl_ash.h',
         'browser/ui/views/ash/balloon_view_ash.cc',
         'browser/ui/views/ash/balloon_view_ash.h',
-        'browser/ui/views/ash/brightness_controller_chromeos.cc',
-        '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/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',
         'browser/ui/views/ash/chrome_shell_delegate.h',
-        'browser/ui/views/ash/event_rewriter.cc',
-        'browser/ui/views/ash/event_rewriter.h',
         'browser/ui/views/ash/extension_utils.cc',
         'browser/ui/views/ash/extension_utils.h',
-        'browser/ui/views/ash/ime_controller_chromeos.cc',
-        'browser/ui/views/ash/ime_controller_chromeos.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',
@@ -3493,8 +3495,6 @@
         '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/screenshot_taker.cc',
-        '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/window_positioner.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 86c3616..3efbd09 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1622,10 +1622,11 @@
         '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/event_rewriter_unittest.cc',
+        'browser/ui/ash/ime_controller_chromeos_unittest.cc',
         'browser/ui/auto_login_prompter_unittest.cc',
         'browser/ui/browser_unittest.cc',
         'browser/ui/chrome_select_file_policy_unittest.cc',
-        'browser/ui/search/search_delegate_unittest.cc',
         # It is safe to list */cocoa/* files in the "common" file list
         # without an explicit exclusion since gyp is smart enough to
         # exclude them from non-Mac builds.
@@ -1802,6 +1803,7 @@
         'browser/ui/panels/panel_cocoa_unittest.mm',
         'browser/ui/panels/panel_mouse_watcher_unittest.cc',
         'browser/ui/search_engines/keyword_editor_controller_unittest.cc',
+        'browser/ui/search/search_delegate_unittest.cc',
         'browser/ui/sync/one_click_signin_helper_unittest.cc',
         'browser/ui/tab_contents/tab_contents_iterator_unittest.cc',
         'browser/ui/tabs/dock_info_unittest.cc',
@@ -1822,8 +1824,6 @@
         '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/event_rewriter_unittest.cc',
-        'browser/ui/views/ash/ime_controller_chromeos_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',
@@ -2194,7 +2194,7 @@
             ['exclude', '^browser/policy/enterprise_install_attributes_unittest.cc' ],
             ['exclude', '^browser/policy/network_configuration_updater_unittest.cc' ],
             ['exclude', '^browser/policy/user_cloud_policy_store_chromeos_unittest.cc'],
-            ['exclude', '^browser/ui/views/ash/ime_controller_chromeos_unittest.cc'],
+            ['exclude', '^browser/ui/ash/ime_controller_chromeos_unittest.cc'],
             ['exclude', '^browser/ui/webui/chromeos/imageburner/'],
             ['exclude', '^browser/ui/webui/chromeos/login'],
             ['exclude', '^browser/ui/webui/options/chromeos/'],