Rename chrome/browser/ui/views/{aura => ash}/

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 54862259b88c6e6b772540f98f834c4b6a5ff2a4..d6143454d662350045440fad7d9701edcde55dbf 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3516,43 +3516,43 @@
         'browser/ui/views/app_menu_button_win.h',
         'browser/ui/views/appcache_info_view.cc',
         'browser/ui/views/appcache_info_view.h',
-        'browser/ui/views/aura/app_list/app_list_model_builder.cc',
-        'browser/ui/views/aura/app_list/app_list_model_builder.h',
-        'browser/ui/views/aura/app_list/app_list_view_delegate.cc',
-        'browser/ui/views/aura/app_list/app_list_view_delegate.h',
-        'browser/ui/views/aura/app_list/browser_command_item.cc',
-        'browser/ui/views/aura/app_list/browser_command_item.h',
-        'browser/ui/views/aura/app_list/chrome_app_list_item.h',
-        'browser/ui/views/aura/app_list/extension_app_item.cc',
-        'browser/ui/views/aura/app_list/extension_app_item.h',
-        'browser/ui/views/aura/brightness_controller_chromeos.cc',
-        'browser/ui/views/aura/brightness_controller_chromeos.h',
-        'browser/ui/views/aura/caps_lock_handler.cc',
-        'browser/ui/views/aura/caps_lock_handler.h',
-        'browser/ui/views/aura/chrome_shell_delegate.cc',
-        'browser/ui/views/aura/chrome_shell_delegate.h',
-        'browser/ui/views/aura/ime_controller_chromeos.cc',
-        'browser/ui/views/aura/ime_controller_chromeos.h',
-        'browser/ui/views/aura/launcher/chrome_launcher_delegate.cc',
-        'browser/ui/views/aura/launcher/chrome_launcher_delegate.h',
-        'browser/ui/views/aura/launcher/launcher_context_menu.cc',
-        'browser/ui/views/aura/launcher/launcher_context_menu.h',
-        'browser/ui/views/aura/launcher/launcher_icon_loader.cc',
-        'browser/ui/views/aura/launcher/launcher_icon_loader.h',
-        'browser/ui/views/aura/launcher/launcher_updater.cc',
-        'browser/ui/views/aura/launcher/launcher_updater.h',
-        'browser/ui/views/aura/panel_view_aura.cc',
-        'browser/ui/views/aura/panel_view_aura.h',
-        'browser/ui/views/aura/screen_orientation_listener.cc',
-        'browser/ui/views/aura/screen_orientation_listener.h',
-        'browser/ui/views/aura/screenshot_taker.cc',
-        'browser/ui/views/aura/screenshot_taker.h',
-        'browser/ui/views/aura/multiple_window_indicator_button.cc',
-        'browser/ui/views/aura/multiple_window_indicator_button.h',
-        'browser/ui/views/aura/status_area_host_aura.cc',
-        'browser/ui/views/aura/status_area_host_aura.h',
-        'browser/ui/views/aura/volume_controller_chromeos.cc',
-        'browser/ui/views/aura/volume_controller_chromeos.h',
+        'browser/ui/views/ash/app_list/app_list_model_builder.cc',
+        'browser/ui/views/ash/app_list/app_list_model_builder.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/browser_command_item.cc',
+        'browser/ui/views/ash/app_list/browser_command_item.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/brightness_controller_chromeos.cc',
+        'browser/ui/views/ash/brightness_controller_chromeos.h',
+        'browser/ui/views/ash/caps_lock_handler.cc',
+        'browser/ui/views/ash/caps_lock_handler.h',
+        'browser/ui/views/ash/chrome_shell_delegate.cc',
+        'browser/ui/views/ash/chrome_shell_delegate.h',
+        'browser/ui/views/ash/ime_controller_chromeos.cc',
+        'browser/ui/views/ash/ime_controller_chromeos.h',
+        'browser/ui/views/ash/launcher/chrome_launcher_delegate.cc',
+        'browser/ui/views/ash/launcher/chrome_launcher_delegate.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_icon_loader.cc',
+        'browser/ui/views/ash/launcher/launcher_icon_loader.h',
+        'browser/ui/views/ash/launcher/launcher_updater.cc',
+        'browser/ui/views/ash/launcher/launcher_updater.h',
+        'browser/ui/views/ash/panel_view_aura.cc',
+        'browser/ui/views/ash/panel_view_aura.h',
+        'browser/ui/views/ash/screen_orientation_listener.cc',
+        'browser/ui/views/ash/screen_orientation_listener.h',
+        'browser/ui/views/ash/screenshot_taker.cc',
+        'browser/ui/views/ash/screenshot_taker.h',
+        'browser/ui/views/ash/multiple_window_indicator_button.cc',
+        'browser/ui/views/ash/multiple_window_indicator_button.h',
+        'browser/ui/views/ash/status_area_host_aura.cc',
+        'browser/ui/views/ash/status_area_host_aura.h',
+        'browser/ui/views/ash/volume_controller_chromeos.cc',
+        'browser/ui/views/ash/volume_controller_chromeos.h',
         'browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc',
         'browser/ui/views/autocomplete/autocomplete_popup_contents_view.h',
         'browser/ui/views/autocomplete/autocomplete_result_view.cc',
@@ -5467,7 +5467,7 @@
             ['exclude', '^browser/google/google_update.cc'],
             ['exclude', '^browser/google/google_update.h'],
             ['exclude', '^browser/platform_util_common_linux.cc'],
-            ['include', '^browser/ui/views/aura/'],
+            ['include', '^browser/ui/views/ash/'],
             ['include', '^browser/ui/views/bookmarks/bookmark_editor_view.cc'],
             ['include', '^browser/ui/views/bookmarks/bookmark_editor_view.h'],
             ['include', '^browser/ui/views/collected_cookies_views.cc'],