WebUI: Move the remaining files from chrome/browser/webui to chrome/browser/ui/webui. Final Part.

BUG=59946 TEST=trybots Review URL: http://codereview.chromium.org/6594035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76191 0039d316-1c4b-4281-b951-d872f2087c98
author: tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2011-02-27 19:33:36 +0000
committer: tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2011-02-27 19:33:36 +0000
commit: fd42ac30f127624def51d949e21f9776b0e6d257 (patch)
tree: 690ae7b46b66bbc03051b460ca5ee66a6665554f
parent: 8ea6a9e57e924dabe697cbf73b6fda59c6297664 (diff)
download: chromium_src-fd42ac30f127624def51d949e21f9776b0e6d257.zip
chromium_src-fd42ac30f127624def51d949e21f9776b0e6d257.tar.gz
chromium_src-fd42ac30f127624def51d949e21f9776b0e6d257.tar.bz2
124 files changed, 249 insertions, 249 deletions
diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc
index 2d574ff..695aa62 100644
--- a/chrome/browser/automation/automation_provider_observers.cc
+++ b/chrome/browser/automation/automation_provider_observers.cc
@@ -52,9 +52,9 @@
 #include "chrome/browser/ui/find_bar/find_notification_details.h"
 #include "chrome/browser/ui/login/login_prompt.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/webui/app_launcher_handler.h"
+#include "chrome/browser/ui/webui/most_visited_handler.h"
 #include "chrome/browser/ui/webui/new_tab_ui.h"
-#include "chrome/browser/webui/app_launcher_handler.h"
-#include "chrome/browser/webui/most_visited_handler.h"
 #include "chrome/common/automation_messages.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/notification_service.h"
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 43b30d7..12767a7 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -39,7 +39,7 @@
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/ui/browser_dialogs.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/about_handler.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_version_info.h"
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 3a701e0..2f494cc 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -73,7 +73,7 @@
 #include "chrome/browser/translate/translate_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_init.h"
-#include "chrome/browser/webui/chrome_url_data_manager_backend.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h"
 #include "chrome/common/child_process.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc
index 7c14c52..dd6d8f0 100644
--- a/chrome/browser/browser_shutdown.cc
+++ b/chrome/browser/browser_shutdown.cc
@@ -33,7 +33,7 @@
 #include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/browser/service/service_process_control_manager.h"
 #include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_plugin_lib.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/browser_signin.cc b/chrome/browser/browser_signin.cc
index 15163e7..9fab11f 100644
--- a/chrome/browser/browser_signin.cc
+++ b/chrome/browser/browser_signin.cc
@@ -20,9 +20,9 @@
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_setup_flow.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/constrained_html_ui.h"
 #include "chrome/browser/ui/webui/html_dialog_ui.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_source.h"
diff --git a/chrome/browser/chromeos/webui/imageburner_ui.h b/chrome/browser/chromeos/webui/imageburner_ui.h
index ca3c31b..1856152 100644
--- a/chrome/browser/chromeos/webui/imageburner_ui.h
+++ b/chrome/browser/chromeos/webui/imageburner_ui.h
@@ -20,7 +20,7 @@
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_util.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "content/browser/webui/web_ui.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/file_stream.h"
diff --git a/chrome/browser/chromeos/webui/keyboard_overlay_ui.cc b/chrome/browser/chromeos/webui/keyboard_overlay_ui.cc
index 4136c1e..cf6adcd 100644
--- a/chrome/browser/chromeos/webui/keyboard_overlay_ui.cc
+++ b/chrome/browser/chromeos/webui/keyboard_overlay_ui.cc
@@ -13,7 +13,7 @@
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
 #include "grit/browser_resources.h"
diff --git a/chrome/browser/chromeos/webui/login/login_ui.cc b/chrome/browser/chromeos/webui/login/login_ui.cc
index 7c03804..6bd5ac2 100644
--- a/chrome/browser/chromeos/webui/login/login_ui.cc
+++ b/chrome/browser/chromeos/webui/login/login_ui.cc
@@ -18,7 +18,7 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/url_constants.h"
 
 namespace chromeos {
diff --git a/chrome/browser/chromeos/webui/login/login_ui.h b/chrome/browser/chromeos/webui/login/login_ui.h
index c40fd9a..05f6ee3 100644
--- a/chrome/browser/chromeos/webui/login/login_ui.h
+++ b/chrome/browser/chromeos/webui/login/login_ui.h
@@ -10,7 +10,7 @@
 
 #include "base/scoped_ptr.h"
 #include "chrome/browser/chromeos/login/login_status_consumer.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "content/browser/webui/web_ui.h"
 
 class Profile;
diff --git a/chrome/browser/chromeos/webui/menu_ui.h b/chrome/browser/chromeos/webui/menu_ui.h
index 736f449..3423aeb 100644
--- a/chrome/browser/chromeos/webui/menu_ui.h
+++ b/chrome/browser/chromeos/webui/menu_ui.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "content/browser/webui/web_ui.h"
 
 class DictionaryValue;
diff --git a/chrome/browser/chromeos/webui/mobile_setup_ui.cc b/chrome/browser/chromeos/webui/mobile_setup_ui.cc
index 920ac58..b2d6d82 100644
--- a/chrome/browser/chromeos/webui/mobile_setup_ui.cc
+++ b/chrome/browser/chromeos/webui/mobile_setup_ui.cc
@@ -29,7 +29,7 @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/chromeos/webui/network_menu_ui.cc b/chrome/browser/chromeos/webui/network_menu_ui.cc
index 1515e26..bc000d4 100644
--- a/chrome/browser/chromeos/webui/network_menu_ui.cc
+++ b/chrome/browser/chromeos/webui/network_menu_ui.cc
@@ -14,7 +14,7 @@
 #include "chrome/browser/chromeos/views/webui_menu_widget.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/webui/theme_source.h"
+#include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
diff --git a/chrome/browser/chromeos/webui/register_page_ui.cc b/chrome/browser/chromeos/webui/register_page_ui.cc
index 1fc45f5c..5b85234 100644
--- a/chrome/browser/chromeos/webui/register_page_ui.cc
+++ b/chrome/browser/chromeos/webui/register_page_ui.cc
@@ -22,7 +22,7 @@
 #include "chrome/browser/chromeos/version_loader.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
diff --git a/chrome/browser/chromeos/webui/system_info_ui.cc b/chrome/browser/chromeos/webui/system_info_ui.cc
index 04e3a9c..ca23fed 100644
--- a/chrome/browser/chromeos/webui/system_info_ui.cc
+++ b/chrome/browser/chromeos/webui/system_info_ui.cc
@@ -19,7 +19,7 @@
 #include "chrome/browser/chromeos/cros/syslogs_library.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/chromeos/webui/user_image_source.h b/chrome/browser/chromeos/webui/user_image_source.h
index c3ccc2d..528dd87 100644
--- a/chrome/browser/chromeos/webui/user_image_source.h
+++ b/chrome/browser/chromeos/webui/user_image_source.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/extensions/extension_bookmark_manager_api.cc b/chrome/browser/extensions/extension_bookmark_manager_api.cc
index bef87cd..d3d1548 100644
--- a/chrome/browser/extensions/extension_bookmark_manager_api.cc
+++ b/chrome/browser/extensions/extension_bookmark_manager_api.cc
@@ -19,7 +19,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc
index 29d2a3a..16c77c0 100644
--- a/chrome/browser/extensions/extension_function_dispatcher.cc
+++ b/chrome/browser/extensions/extension_function_dispatcher.cc
@@ -51,8 +51,8 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
-#include "chrome/browser/webui/favicon_source.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index b3bb620..8c08fc6 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -48,7 +48,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
-#include "chrome/browser/webui/shown_sections_handler.h"
+#include "chrome/browser/ui/webui/shown_sections_handler.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
diff --git a/chrome/browser/extensions/extensions_ui.h b/chrome/browser/extensions/extensions_ui.h
index cf3d618..b7f897e3 100644
--- a/chrome/browser/extensions/extensions_ui.h
+++ b/chrome/browser/extensions/extensions_ui.h
@@ -13,7 +13,7 @@
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/pack_extension_job.h"
 #include "chrome/browser/ui/shell_dialogs.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
diff --git a/chrome/browser/history/top_sites.cc b/chrome/browser/history/top_sites.cc
index 0bd30ff..6d382e7b 100644
--- a/chrome/browser/history/top_sites.cc
+++ b/chrome/browser/history/top_sites.cc
@@ -23,7 +23,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
-#include "chrome/browser/webui/most_visited_handler.h"
+#include "chrome/browser/ui/webui/most_visited_handler.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/history/top_sites_unittest.cc b/chrome/browser/history/top_sites_unittest.cc
index be9ba74..32b7caf 100644
--- a/chrome/browser/history/top_sites_unittest.cc
+++ b/chrome/browser/history/top_sites_unittest.cc
@@ -19,7 +19,7 @@
 #include "chrome/browser/history/top_sites_backend.h"
 #include "chrome/browser/history/top_sites_cache.h"
 #include "chrome/browser/history/top_sites_database.h"
-#include "chrome/browser/webui/most_visited_handler.h"
+#include "chrome/browser/ui/webui/most_visited_handler.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc
index b93bf09..60b87be 100644
--- a/chrome/browser/net/chrome_url_request_context.cc
+++ b/chrome/browser/net/chrome_url_request_context.cc
@@ -12,7 +12,7 @@
 #include "chrome/browser/net/chrome_cookie_policy.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_io_data.h"
-#include "chrome/browser/webui/chrome_url_data_manager_backend.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "net/base/cookie_store.h"
diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc
index 7a012f5..7cdcd30 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc
+++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc
@@ -25,7 +25,7 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/net/gaia/gaia_auth_fetcher.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_source.h b/chrome/browser/printing/cloud_print/cloud_print_setup_source.h
index 708a6c0..2284be7 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_setup_source.h
+++ b/chrome/browser/printing/cloud_print/cloud_print_setup_source.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/message_loop.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/url_constants.h"
 
 class CloudPrintSetupSource : public ChromeURLDataManager::DataSource {
diff --git a/chrome/browser/printing/print_dialog_cloud_uitest.cc b/chrome/browser/printing/print_dialog_cloud_uitest.cc
index 248c44f..fc63237 100644
--- a/chrome/browser/printing/print_dialog_cloud_uitest.cc
+++ b/chrome/browser/printing/print_dialog_cloud_uitest.cc
@@ -19,7 +19,7 @@
 #include "chrome/browser/printing/cloud_print/cloud_print_url.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/in_process_browser_test.h"
diff --git a/chrome/browser/printing/print_preview_message_handler.cc b/chrome/browser/printing/print_preview_message_handler.cc
index 8ca6eff..bd4c1c3 100644
--- a/chrome/browser/printing/print_preview_message_handler.cc
+++ b/chrome/browser/printing/print_preview_message_handler.cc
@@ -11,9 +11,9 @@
 #include "chrome/browser/printing/printer_query.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/ui/webui/print_preview_handler.h"
 #include "chrome/browser/ui/webui/print_preview_ui.h"
 #include "chrome/browser/ui/webui/print_preview_ui_html_source.h"
-#include "chrome/browser/webui/print_preview_handler.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
 #include "ipc/ipc_message_macros.h"
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
index 3d202cd..348ad087 100644
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -31,7 +31,7 @@
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
 #include "chrome/browser/ui/find_bar/find_bar_state.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index f639147..8402e83 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -73,13 +73,13 @@
 #include "chrome/browser/themes/browser_theme_provider.h"
 #include "chrome/browser/transport_security_persister.h"
 #include "chrome/browser/ui/find_bar/find_bar_state.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/ntp_resource_cache.h"
 #include "chrome/browser/user_style_sheet_watcher.h"
 #include "chrome/browser/visitedlink/visitedlink_event_listener.h"
 #include "chrome/browser/visitedlink/visitedlink_master.h"
 #include "chrome/browser/web_resource/promo_resource_service.h"
 #include "chrome/browser/webdata/web_data_service.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
-#include "chrome/browser/webui/ntp_resource_cache.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
diff --git a/chrome/browser/remoting/remoting_resources_source.h b/chrome/browser/remoting/remoting_resources_source.h
index 5d1f6fc..83d8943 100644
--- a/chrome/browser/remoting/remoting_resources_source.h
+++ b/chrome/browser/remoting/remoting_resources_source.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_REMOTING_REMOTING_RESOURCES_SOURCE_H_
 
 #include "base/message_loop.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/url_constants.h"
 
 class RemotingResourcesSource : public ChromeURLDataManager::DataSource {
diff --git a/chrome/browser/sync/profile_sync_service_mock.cc b/chrome/browser/sync/profile_sync_service_mock.cc
index 39b9291..bf46922 100644
--- a/chrome/browser/sync/profile_sync_service_mock.cc
+++ b/chrome/browser/sync/profile_sync_service_mock.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/profile_sync_service_mock.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/url_constants.h"
 
 ProfileSyncServiceMock::ProfileSyncServiceMock() {}
diff --git a/chrome/browser/sync/sync_setup_wizard.cc b/chrome/browser/sync/sync_setup_wizard.cc
index 0dd2658..74d7b14 100644
--- a/chrome/browser/sync/sync_setup_wizard.cc
+++ b/chrome/browser/sync/sync_setup_wizard.cc
@@ -12,7 +12,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_setup_flow.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/ui/cocoa/constrained_html_delegate_mac.mm b/chrome/browser/ui/cocoa/constrained_html_delegate_mac.mm
index 61b9a75..9c1165d 100644
--- a/chrome/browser/ui/cocoa/constrained_html_delegate_mac.mm
+++ b/chrome/browser/ui/cocoa/constrained_html_delegate_mac.mm
@@ -9,7 +9,7 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/cocoa/constrained_window_mac.h"
 #include "chrome/browser/ui/webui/html_dialog_ui.h"
-#include "chrome/browser/webui/html_dialog_tab_contents_delegate.h"
+#include "chrome/browser/ui/webui/html_dialog_tab_contents_delegate.h"
 #import <Cocoa/Cocoa.h>
 #include "ipc/ipc_message.h"
 
diff --git a/chrome/browser/ui/cocoa/html_dialog_window_controller.mm b/chrome/browser/ui/cocoa/html_dialog_window_controller.mm
index 68d25df..1a5fb51 100644
--- a/chrome/browser/ui/cocoa/html_dialog_window_controller.mm
+++ b/chrome/browser/ui/cocoa/html_dialog_window_controller.mm
@@ -12,8 +12,8 @@
 #import "chrome/browser/ui/browser_dialogs.h"
 #import "chrome/browser/ui/cocoa/browser_command_executor.h"
 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
+#include "chrome/browser/ui/webui/html_dialog_tab_contents_delegate.h"
 #include "chrome/browser/ui/webui/html_dialog_ui.h"
-#include "chrome/browser/webui/html_dialog_tab_contents_delegate.h"
 #include "chrome/common/native_web_keyboard_event.h"
 #include "ipc/ipc_message.h"
 #include "ui/base/keycodes/keyboard_codes.h"
diff --git a/chrome/browser/ui/gtk/constrained_html_delegate_gtk.cc b/chrome/browser/ui/gtk/constrained_html_delegate_gtk.cc
index 689125f..94e4fcb 100644
--- a/chrome/browser/ui/gtk/constrained_html_delegate_gtk.cc
+++ b/chrome/browser/ui/gtk/constrained_html_delegate_gtk.cc
@@ -9,8 +9,8 @@
 #include "chrome/browser/ui/gtk/constrained_window_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/tab_contents_container_gtk.h"
+#include "chrome/browser/ui/webui/html_dialog_tab_contents_delegate.h"
 #include "chrome/browser/ui/webui/html_dialog_ui.h"
-#include "chrome/browser/webui/html_dialog_tab_contents_delegate.h"
 #include "chrome/common/notification_source.h"
 #include "ipc/ipc_message.h"
 #include "ui/gfx/rect.h"
diff --git a/chrome/browser/ui/gtk/html_dialog_gtk.h b/chrome/browser/ui/gtk/html_dialog_gtk.h
index 11cbcca..065f496 100644
--- a/chrome/browser/ui/gtk/html_dialog_gtk.h
+++ b/chrome/browser/ui/gtk/html_dialog_gtk.h
@@ -10,8 +10,8 @@
 #include <vector>
 
 #include "base/scoped_ptr.h"
+#include "chrome/browser/ui/webui/html_dialog_tab_contents_delegate.h"
 #include "chrome/browser/ui/webui/html_dialog_ui.h"
-#include "chrome/browser/webui/html_dialog_tab_contents_delegate.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
diff --git a/chrome/browser/ui/views/constrained_html_delegate_gtk.cc b/chrome/browser/ui/views/constrained_html_delegate_gtk.cc
index df9ba4f..104c9c0 100644
--- a/chrome/browser/ui/views/constrained_html_delegate_gtk.cc
+++ b/chrome/browser/ui/views/constrained_html_delegate_gtk.cc
@@ -9,8 +9,8 @@
 #include "chrome/browser/ui/gtk/constrained_window_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h"
+#include "chrome/browser/ui/webui/html_dialog_tab_contents_delegate.h"
 #include "chrome/browser/ui/webui/html_dialog_ui.h"
-#include "chrome/browser/webui/html_dialog_tab_contents_delegate.h"
 #include "ipc/ipc_message.h"
 #include "ui/gfx/rect.h"
 #include "views/widget/widget_gtk.h"
diff --git a/chrome/browser/ui/views/constrained_html_delegate_win.cc b/chrome/browser/ui/views/constrained_html_delegate_win.cc
index b8d51c0..f73c499 100644
--- a/chrome/browser/ui/views/constrained_html_delegate_win.cc
+++ b/chrome/browser/ui/views/constrained_html_delegate_win.cc
@@ -7,8 +7,8 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h"
+#include "chrome/browser/ui/webui/html_dialog_tab_contents_delegate.h"
 #include "chrome/browser/ui/webui/html_dialog_ui.h"
-#include "chrome/browser/webui/html_dialog_tab_contents_delegate.h"
 #include "ipc/ipc_message.h"
 #include "ui/gfx/rect.h"
 #include "views/view.h"
diff --git a/chrome/browser/ui/views/html_dialog_view.h b/chrome/browser/ui/views/html_dialog_view.h
index 9329c1e..2cdefd1 100644
--- a/chrome/browser/ui/views/html_dialog_view.h
+++ b/chrome/browser/ui/views/html_dialog_view.h
@@ -9,8 +9,8 @@
 #include <string>
 
 #include "chrome/browser/ui/views/dom_view.h"
+#include "chrome/browser/ui/webui/html_dialog_tab_contents_delegate.h"
 #include "chrome/browser/ui/webui/html_dialog_ui.h"
-#include "chrome/browser/webui/html_dialog_tab_contents_delegate.h"
 #include "ui/gfx/size.h"
 #include "views/window/window_delegate.h"
 
diff --git a/chrome/browser/webui/OWNERS b/chrome/browser/ui/webui/OWNERS
index 741a5c4..741a5c4 100644
--- a/chrome/browser/webui/OWNERS
+++ b/chrome/browser/ui/webui/OWNERS
diff --git a/chrome/browser/webui/app_launcher_handler.cc b/chrome/browser/ui/webui/app_launcher_handler.cc
index 9f51350..215a8df 100644
--- a/chrome/browser/webui/app_launcher_handler.cc
+++ b/chrome/browser/ui/webui/app_launcher_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/webui/app_launcher_handler.h"
+#include "chrome/browser/ui/webui/app_launcher_handler.h"
 
 #include <string>
 #include <vector>
@@ -23,7 +23,7 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/webui/shown_sections_handler.h"
+#include "chrome/browser/ui/webui/shown_sections_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
diff --git a/chrome/browser/webui/app_launcher_handler.h b/chrome/browser/ui/webui/app_launcher_handler.h
index 4edff88..737199b 100644
--- a/chrome/browser/webui/app_launcher_handler.h
+++ b/chrome/browser/ui/webui/app_launcher_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_WEBUI_APP_LAUNCHER_HANDLER_H_
-#define CHROME_BROWSER_WEBUI_APP_LAUNCHER_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_APP_LAUNCHER_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_APP_LAUNCHER_HANDLER_H_
 #pragma once
 
 #include "base/scoped_ptr.h"
@@ -130,4 +130,4 @@ class AppLauncherHandler
   DISALLOW_COPY_AND_ASSIGN(AppLauncherHandler);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_APP_LAUNCHER_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_APP_LAUNCHER_HANDLER_H_
diff --git a/chrome/browser/ui/webui/bookmarks_ui.cc b/chrome/browser/ui/webui/bookmarks_ui.cc
index 3cdd0f4..8603f7c 100644
--- a/chrome/browser/ui/webui/bookmarks_ui.cc
+++ b/chrome/browser/ui/webui/bookmarks_ui.cc
@@ -10,7 +10,7 @@
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/url_constants.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/browser/ui/webui/bookmarks_ui.h b/chrome/browser/ui/webui/bookmarks_ui.h
index 10c5113..c304dce 100644
--- a/chrome/browser/ui/webui/bookmarks_ui.h
+++ b/chrome/browser/ui/webui/bookmarks_ui.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "content/browser/webui/web_ui.h"
 
 class GURL;
diff --git a/chrome/browser/ui/webui/bug_report_ui.cc b/chrome/browser/ui/webui/bug_report_ui.cc
index 1b99d6a..700c5cc 100644
--- a/chrome/browser/ui/webui/bug_report_ui.cc
+++ b/chrome/browser/ui/webui/bug_report_ui.cc
@@ -25,8 +25,8 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/webui/screenshot_source.h"
 #include "chrome/browser/ui/window_snapshot/window_snapshot.h"
-#include "chrome/browser/webui/screenshot_source.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/webui/chrome_url_data_manager.cc b/chrome/browser/ui/webui/chrome_url_data_manager.cc
index d7abed2..4127d68 100644
--- a/chrome/browser/webui/chrome_url_data_manager.cc
+++ b/chrome/browser/ui/webui/chrome_url_data_manager.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/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 
 #include <vector>
 
@@ -15,7 +15,7 @@
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/webui/chrome_url_data_manager_backend.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h"
 #include "grit/platform_locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 
diff --git a/chrome/browser/webui/chrome_url_data_manager.h b/chrome/browser/ui/webui/chrome_url_data_manager.h
index e953c70..f0f2580 100644
--- a/chrome/browser/webui/chrome_url_data_manager.h
+++ b/chrome/browser/ui/webui/chrome_url_data_manager.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_WEBUI_CHROME_URL_DATA_MANAGER_H_
-#define CHROME_BROWSER_WEBUI_CHROME_URL_DATA_MANAGER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_CHROME_URL_DATA_MANAGER_H_
+#define CHROME_BROWSER_UI_WEBUI_CHROME_URL_DATA_MANAGER_H_
 #pragma once
 
 #include <string>
@@ -178,4 +178,4 @@ class ChromeURLDataManager {
   DISALLOW_COPY_AND_ASSIGN(ChromeURLDataManager);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_CHROME_URL_DATA_MANAGER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_CHROME_URL_DATA_MANAGER_H_
diff --git a/chrome/browser/webui/chrome_url_data_manager_backend.cc b/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc
index fc386df..ce523a3 100644
--- a/chrome/browser/webui/chrome_url_data_manager_backend.cc
+++ b/chrome/browser/ui/webui/chrome_url_data_manager_backend.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/webui/chrome_url_data_manager_backend.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h"
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
@@ -12,7 +12,7 @@
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/net/view_blob_internals_job_factory.h"
 #include "chrome/browser/net/view_http_cache_job_factory.h"
-#include "chrome/browser/webui/shared_resources_data_source.h"
+#include "chrome/browser/ui/webui/shared_resources_data_source.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/appcache/view_appcache_internals_job_factory.h"
diff --git a/chrome/browser/webui/chrome_url_data_manager_backend.h b/chrome/browser/ui/webui/chrome_url_data_manager_backend.h
index 01ffdb7..926fb79 100644
--- a/chrome/browser/webui/chrome_url_data_manager_backend.h
+++ b/chrome/browser/ui/webui/chrome_url_data_manager_backend.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_WEBUI_CHROME_URL_DATA_MANAGER_BACKEND_H_
-#define CHROME_BROWSER_WEBUI_CHROME_URL_DATA_MANAGER_BACKEND_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_CHROME_URL_DATA_MANAGER_BACKEND_H_
+#define CHROME_BROWSER_UI_WEBUI_CHROME_URL_DATA_MANAGER_BACKEND_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 
 #include <map>
 #include <string>
@@ -96,4 +96,4 @@ class ChromeURLDataManagerBackend {
   DISALLOW_COPY_AND_ASSIGN(ChromeURLDataManagerBackend);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_CHROME_URL_DATA_MANAGER_BACKEND_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_CHROME_URL_DATA_MANAGER_BACKEND_H_
diff --git a/chrome/browser/ui/webui/conflicts_ui.cc b/chrome/browser/ui/webui/conflicts_ui.cc
index 5ff5a65..1f24a13 100644
--- a/chrome/browser/ui/webui/conflicts_ui.cc
+++ b/chrome/browser/ui/webui/conflicts_ui.cc
@@ -15,7 +15,7 @@
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/crashes_ui.cc
index d4bb435..c8d5f86 100644
--- a/chrome/browser/ui/webui/crashes_ui.cc
+++ b/chrome/browser/ui/webui/crashes_ui.cc
@@ -12,7 +12,7 @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/webui/downloads_dom_handler.cc b/chrome/browser/ui/webui/downloads_dom_handler.cc
index 549f389..49a9fc0 100644
--- a/chrome/browser/webui/downloads_dom_handler.cc
+++ b/chrome/browser/ui/webui/downloads_dom_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/webui/downloads_dom_handler.h"
+#include "chrome/browser/ui/webui/downloads_dom_handler.h"
 
 #include <algorithm>
 #include <functional>
@@ -22,8 +22,8 @@
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
-#include "chrome/browser/webui/fileicon_source.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/fileicon_source.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/webui/downloads_dom_handler.h b/chrome/browser/ui/webui/downloads_dom_handler.h
index f78f3ae..a47ff1b 100644
--- a/chrome/browser/webui/downloads_dom_handler.h
+++ b/chrome/browser/ui/webui/downloads_dom_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_WEBUI_DOWNLOADS_DOM_HANDLER_H_
-#define CHROME_BROWSER_WEBUI_DOWNLOADS_DOM_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_DOWNLOADS_DOM_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_DOWNLOADS_DOM_HANDLER_H_
 #pragma once
 
 #include <vector>
@@ -100,4 +100,4 @@ class DownloadsDOMHandler : public WebUIMessageHandler,
   DISALLOW_COPY_AND_ASSIGN(DownloadsDOMHandler);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_DOWNLOADS_DOM_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_DOWNLOADS_DOM_HANDLER_H_
diff --git a/chrome/browser/ui/webui/downloads_ui.cc b/chrome/browser/ui/webui/downloads_ui.cc
index 96f7466..67b1c5a 100644
--- a/chrome/browser/ui/webui/downloads_ui.cc
+++ b/chrome/browser/ui/webui/downloads_ui.cc
@@ -13,8 +13,8 @@
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
-#include "chrome/browser/webui/downloads_dom_handler.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/downloads_dom_handler.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
 #include "grit/browser_resources.h"
diff --git a/chrome/browser/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc
index 3650c8d..8461a41 100644
--- a/chrome/browser/webui/favicon_source.cc
+++ b/chrome/browser/ui/webui/favicon_source.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/webui/favicon_source.h"
+#include "chrome/browser/ui/webui/favicon_source.h"
 
 #include "base/callback.h"
 #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/webui/favicon_source.h b/chrome/browser/ui/webui/favicon_source.h
index 097f0b1..4816ec5 100644
--- a/chrome/browser/webui/favicon_source.h
+++ b/chrome/browser/ui/webui/favicon_source.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_WEBUI_FAVICON_SOURCE_H_
-#define CHROME_BROWSER_WEBUI_FAVICON_SOURCE_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_FAVICON_SOURCE_H_
+#define CHROME_BROWSER_UI_WEBUI_FAVICON_SOURCE_H_
 #pragma once
 
 #include <string>
@@ -11,7 +11,7 @@
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "chrome/browser/favicon_service.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 
 class GURL;
 class Profile;
@@ -55,4 +55,4 @@ class FavIconSource : public ChromeURLDataManager::DataSource {
   DISALLOW_COPY_AND_ASSIGN(FavIconSource);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_FAVICON_SOURCE_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_FAVICON_SOURCE_H_
diff --git a/chrome/browser/webui/file_browse_browsertest.cc b/chrome/browser/ui/webui/file_browse_browsertest.cc
index 030b221..030b221 100644
--- a/chrome/browser/webui/file_browse_browsertest.cc
+++ b/chrome/browser/ui/webui/file_browse_browsertest.cc
diff --git a/chrome/browser/ui/webui/filebrowse_ui.cc b/chrome/browser/ui/webui/filebrowse_ui.cc
index 6d6c1cb..a20d575 100644
--- a/chrome/browser/ui/webui/filebrowse_ui.cc
+++ b/chrome/browser/ui/webui/filebrowse_ui.cc
@@ -35,8 +35,8 @@
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/browser/ui/webui/mediaplayer_ui.h"
-#include "chrome/browser/webui/favicon_source.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/jstemplate_builder.h"
diff --git a/chrome/browser/ui/webui/filebrowse_ui.h b/chrome/browser/ui/webui/filebrowse_ui.h
index 1df17d4..3e3a69c 100644
--- a/chrome/browser/ui/webui/filebrowse_ui.h
+++ b/chrome/browser/ui/webui/filebrowse_ui.h
@@ -9,8 +9,8 @@
 #include <string>
 
 #include "chrome/browser/history/history.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/html_dialog_ui.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
 #include "net/base/directory_lister.h"
 
 class Browser;
diff --git a/chrome/browser/webui/fileicon_source.cc b/chrome/browser/ui/webui/fileicon_source.cc
index c403f36..fe08a65 100644
--- a/chrome/browser/webui/fileicon_source.cc
+++ b/chrome/browser/ui/webui/fileicon_source.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/webui/fileicon_source.h"
+#include "chrome/browser/ui/webui/fileicon_source.h"
 
 #include "base/callback.h"
 #include "base/file_path.h"
diff --git a/chrome/browser/webui/fileicon_source.h b/chrome/browser/ui/webui/fileicon_source.h
index a515def..d160cb6 100644
--- a/chrome/browser/webui/fileicon_source.h
+++ b/chrome/browser/ui/webui/fileicon_source.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_WEBUI_FILEICON_SOURCE_H_
-#define CHROME_BROWSER_WEBUI_FILEICON_SOURCE_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_FILEICON_SOURCE_H_
+#define CHROME_BROWSER_UI_WEBUI_FILEICON_SOURCE_H_
 #pragma once
 
 #include <string>
 
 #include "chrome/browser/icon_manager.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 
 class GURL;
 class RefCountedBytes;
@@ -44,4 +44,4 @@ class FileIconSource : public ChromeURLDataManager::DataSource {
 
   DISALLOW_COPY_AND_ASSIGN(FileIconSource);
 };
-#endif  // CHROME_BROWSER_WEBUI_FILEICON_SOURCE_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_FILEICON_SOURCE_H_
diff --git a/chrome/browser/ui/webui/flags_ui.cc b/chrome/browser/ui/webui/flags_ui.cc
index 8724388..e861ad1 100644
--- a/chrome/browser/ui/webui/flags_ui.cc
+++ b/chrome/browser/ui/webui/flags_ui.cc
@@ -15,7 +15,7 @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/webui/foreign_session_handler.cc b/chrome/browser/ui/webui/foreign_session_handler.cc
index 6c6b2e7..7b2cb77 100644
--- a/chrome/browser/webui/foreign_session_handler.cc
+++ b/chrome/browser/ui/webui/foreign_session_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/webui/foreign_session_handler.h"
+#include "chrome/browser/ui/webui/foreign_session_handler.h"
 
 #include <algorithm>
 #include <string>
diff --git a/chrome/browser/webui/foreign_session_handler.h b/chrome/browser/ui/webui/foreign_session_handler.h
index 2e23e6b..287ce94b 100644
--- a/chrome/browser/webui/foreign_session_handler.h
+++ b/chrome/browser/ui/webui/foreign_session_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_WEBUI_FOREIGN_SESSION_HANDLER_H_
-#define CHROME_BROWSER_WEBUI_FOREIGN_SESSION_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_FOREIGN_SESSION_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_FOREIGN_SESSION_HANDLER_H_
 #pragma once
 
 #include <vector>
@@ -60,4 +60,4 @@ class ForeignSessionHandler : public WebUIMessageHandler,
 
 }  // namespace browser_sync
 
-#endif  // CHROME_BROWSER_WEBUI_FOREIGN_SESSION_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_FOREIGN_SESSION_HANDLER_H_
diff --git a/chrome/browser/webui/generic_handler.cc b/chrome/browser/ui/webui/generic_handler.cc
index e3a4a63..dba7bdb 100644
--- a/chrome/browser/webui/generic_handler.cc
+++ b/chrome/browser/ui/webui/generic_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/webui/generic_handler.h"
+#include "chrome/browser/ui/webui/generic_handler.h"
 
 #include "base/logging.h"
 #include "base/values.h"
diff --git a/chrome/browser/webui/generic_handler.h b/chrome/browser/ui/webui/generic_handler.h
index cd476db..bf40d08 100644
--- a/chrome/browser/webui/generic_handler.h
+++ b/chrome/browser/ui/webui/generic_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_WEBUI_GENERIC_HANDLER_H_
-#define CHROME_BROWSER_WEBUI_GENERIC_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_GENERIC_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_GENERIC_HANDLER_H_
 #pragma once
 
 #include "content/browser/webui/web_ui.h"
@@ -25,4 +25,4 @@ class GenericHandler : public WebUIMessageHandler {
   DISALLOW_COPY_AND_ASSIGN(GenericHandler);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_GENERIC_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_GENERIC_HANDLER_H_
diff --git a/chrome/browser/ui/webui/gpu_internals_ui.cc b/chrome/browser/ui/webui/gpu_internals_ui.cc
index 69cc2b7..59fd954 100644
--- a/chrome/browser/ui/webui/gpu_internals_ui.cc
+++ b/chrome/browser/ui/webui/gpu_internals_ui.cc
@@ -31,7 +31,7 @@
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/jstemplate_builder.h"
diff --git a/chrome/browser/ui/webui/history2_ui.cc b/chrome/browser/ui/webui/history2_ui.cc
index fcdce94..edc3eb5 100644
--- a/chrome/browser/ui/webui/history2_ui.cc
+++ b/chrome/browser/ui/webui/history2_ui.cc
@@ -27,7 +27,7 @@
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/webui/favicon_source.h"
+#include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/time_format.h"
diff --git a/chrome/browser/ui/webui/history2_ui.h b/chrome/browser/ui/webui/history2_ui.h
index cf99253..4a7f641 100644
--- a/chrome/browser/ui/webui/history2_ui.h
+++ b/chrome/browser/ui/webui/history2_ui.h
@@ -11,7 +11,7 @@
 #include "base/string16.h"
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/history/history.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/notification_registrar.h"
 #include "content/browser/webui/web_ui.h"
 
diff --git a/chrome/browser/ui/webui/history_ui.cc b/chrome/browser/ui/webui/history_ui.cc
index 5cc50da8..7155cde 100644
--- a/chrome/browser/ui/webui/history_ui.cc
+++ b/chrome/browser/ui/webui/history_ui.cc
@@ -27,7 +27,7 @@
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/webui/favicon_source.h"
+#include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/time_format.h"
diff --git a/chrome/browser/ui/webui/history_ui.h b/chrome/browser/ui/webui/history_ui.h
index 0513fbe..ee64769 100644
--- a/chrome/browser/ui/webui/history_ui.h
+++ b/chrome/browser/ui/webui/history_ui.h
@@ -11,7 +11,7 @@
 #include "base/string16.h"
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/history/history.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/notification_registrar.h"
 #include "content/browser/webui/web_ui.h"
 
diff --git a/chrome/browser/webui/html_dialog_tab_contents_delegate.cc b/chrome/browser/ui/webui/html_dialog_tab_contents_delegate.cc
index 729c90b..3bfb372 100644
--- a/chrome/browser/webui/html_dialog_tab_contents_delegate.cc
+++ b/chrome/browser/ui/webui/html_dialog_tab_contents_delegate.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/webui/html_dialog_tab_contents_delegate.h"
+#include "chrome/browser/ui/webui/html_dialog_tab_contents_delegate.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
diff --git a/chrome/browser/webui/html_dialog_tab_contents_delegate.h b/chrome/browser/ui/webui/html_dialog_tab_contents_delegate.h
index 5ed8795..3dde68d 100644
--- a/chrome/browser/webui/html_dialog_tab_contents_delegate.h
+++ b/chrome/browser/ui/webui/html_dialog_tab_contents_delegate.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_WEBUI_HTML_DIALOG_TAB_CONTENTS_DELEGATE_H_
-#define CHROME_BROWSER_WEBUI_HTML_DIALOG_TAB_CONTENTS_DELEGATE_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_HTML_DIALOG_TAB_CONTENTS_DELEGATE_H_
+#define CHROME_BROWSER_UI_WEBUI_HTML_DIALOG_TAB_CONTENTS_DELEGATE_H_
 #pragma once
 
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
@@ -61,4 +61,4 @@ class HtmlDialogTabContentsDelegate : public TabContentsDelegate {
   Profile* profile_;  // Weak pointer.  Always an original profile.
 };
 
-#endif  // CHROME_BROWSER_WEBUI_HTML_DIALOG_TAB_CONTENTS_DELEGATE_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_HTML_DIALOG_TAB_CONTENTS_DELEGATE_H_
diff --git a/chrome/browser/webui/html_dialog_tab_contents_delegate_unittest.cc b/chrome/browser/ui/webui/html_dialog_tab_contents_delegate_unittest.cc
index 58da688..371c133 100644
--- a/chrome/browser/webui/html_dialog_tab_contents_delegate_unittest.cc
+++ b/chrome/browser/ui/webui/html_dialog_tab_contents_delegate_unittest.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/webui/html_dialog_tab_contents_delegate.h"
+#include "chrome/browser/ui/webui/html_dialog_tab_contents_delegate.h"
 
 #include <vector>
 
diff --git a/chrome/browser/ui/webui/keyboard_ui.cc b/chrome/browser/ui/webui/keyboard_ui.cc
index af7445c..5c15836 100644
--- a/chrome/browser/ui/webui/keyboard_ui.cc
+++ b/chrome/browser/ui/webui/keyboard_ui.cc
@@ -10,7 +10,7 @@
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/url_constants.h"
 #include "ui/base/resource/resource_bundle.h"
 
diff --git a/chrome/browser/ui/webui/keyboard_ui.h b/chrome/browser/ui/webui/keyboard_ui.h
index 980e28b..896dd09 100644
--- a/chrome/browser/ui/webui/keyboard_ui.h
+++ b/chrome/browser/ui/webui/keyboard_ui.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "content/browser/webui/web_ui.h"
 
 class Profile;
diff --git a/chrome/browser/webui/mediaplayer_browsertest.cc b/chrome/browser/ui/webui/mediaplayer_browsertest.cc
index a02ed6e..a02ed6e 100644
--- a/chrome/browser/webui/mediaplayer_browsertest.cc
+++ b/chrome/browser/ui/webui/mediaplayer_browsertest.cc
diff --git a/chrome/browser/ui/webui/mediaplayer_ui.cc b/chrome/browser/ui/webui/mediaplayer_ui.cc
index d43930f..ee77f25 100644
--- a/chrome/browser/ui/webui/mediaplayer_ui.cc
+++ b/chrome/browser/ui/webui/mediaplayer_ui.cc
@@ -27,7 +27,7 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/webui/favicon_source.h"
+#include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/jstemplate_builder.h"
diff --git a/chrome/browser/ui/webui/mediaplayer_ui.h b/chrome/browser/ui/webui/mediaplayer_ui.h
index 5b5afcf..1dcef54 100644
--- a/chrome/browser/ui/webui/mediaplayer_ui.h
+++ b/chrome/browser/ui/webui/mediaplayer_ui.h
@@ -9,7 +9,7 @@
 #include <set>
 #include <vector>
 
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_source.h"
diff --git a/chrome/browser/webui/most_visited_handler.cc b/chrome/browser/ui/webui/most_visited_handler.cc
index b171f67..6aa4ce5 100644
--- a/chrome/browser/webui/most_visited_handler.cc
+++ b/chrome/browser/ui/webui/most_visited_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/webui/most_visited_handler.h"
+#include "chrome/browser/ui/webui/most_visited_handler.h"
 
 #include <set>
 
@@ -22,10 +22,10 @@
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/browser/ui/webui/new_tab_ui.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
-#include "chrome/browser/webui/favicon_source.h"
-#include "chrome/browser/webui/thumbnail_source.h"
+#include "chrome/browser/ui/webui/thumbnail_source.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/webui/most_visited_handler.h b/chrome/browser/ui/webui/most_visited_handler.h
index 60e9ba8..1d51b67 100644
--- a/chrome/browser/webui/most_visited_handler.h
+++ b/chrome/browser/ui/webui/most_visited_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_WEBUI_MOST_VISITED_HANDLER_H_
-#define CHROME_BROWSER_WEBUI_MOST_VISITED_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_MOST_VISITED_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_MOST_VISITED_HANDLER_H_
 #pragma once
 
 #include <string>
@@ -133,4 +133,4 @@ class MostVisitedHandler : public WebUIMessageHandler,
   DISALLOW_COPY_AND_ASSIGN(MostVisitedHandler);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_MOST_VISITED_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_MOST_VISITED_HANDLER_H_
diff --git a/chrome/browser/ui/webui/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals_ui.cc
index 4791c319..b57708f 100644
--- a/chrome/browser/ui/webui/net_internals_ui.cc
+++ b/chrome/browser/ui/webui/net_internals_ui.cc
@@ -31,7 +31,7 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/ui/shell_dialogs.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/jstemplate_builder.h"
diff --git a/chrome/browser/webui/new_tab_page_sync_handler.cc b/chrome/browser/ui/webui/new_tab_page_sync_handler.cc
index e5bb438..24dca0a 100644
--- a/chrome/browser/webui/new_tab_page_sync_handler.cc
+++ b/chrome/browser/ui/webui/new_tab_page_sync_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/webui/new_tab_page_sync_handler.h"
+#include "chrome/browser/ui/webui/new_tab_page_sync_handler.h"
 
 #include <vector>
 
diff --git a/chrome/browser/webui/new_tab_page_sync_handler.h b/chrome/browser/ui/webui/new_tab_page_sync_handler.h
index 3291533..e7c219d 100644
--- a/chrome/browser/webui/new_tab_page_sync_handler.h
+++ b/chrome/browser/ui/webui/new_tab_page_sync_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_WEBUI_NEW_TAB_PAGE_SYNC_HANDLER_H_
-#define CHROME_BROWSER_WEBUI_NEW_TAB_PAGE_SYNC_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_NEW_TAB_PAGE_SYNC_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_NEW_TAB_PAGE_SYNC_HANDLER_H_
 #pragma once
 
 #include <string>
@@ -66,4 +66,4 @@ class NewTabPageSyncHandler : public WebUIMessageHandler,
   DISALLOW_COPY_AND_ASSIGN(NewTabPageSyncHandler);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_NEW_TAB_PAGE_SYNC_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_NEW_TAB_PAGE_SYNC_HANDLER_H_
diff --git a/chrome/browser/ui/webui/new_tab_ui.cc b/chrome/browser/ui/webui/new_tab_ui.cc
index a2e28b7..319f6ae 100644
--- a/chrome/browser/ui/webui/new_tab_ui.cc
+++ b/chrome/browser/ui/webui/new_tab_ui.cc
@@ -28,16 +28,16 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/webui/app_launcher_handler.h"
-#include "chrome/browser/webui/foreign_session_handler.h"
-#include "chrome/browser/webui/most_visited_handler.h"
-#include "chrome/browser/webui/new_tab_page_sync_handler.h"
-#include "chrome/browser/webui/ntp_login_handler.h"
-#include "chrome/browser/webui/ntp_resource_cache.h"
-#include "chrome/browser/webui/shown_sections_handler.h"
-#include "chrome/browser/webui/theme_source.h"
-#include "chrome/browser/webui/tips_handler.h"
-#include "chrome/browser/webui/value_helper.h"
+#include "chrome/browser/ui/webui/app_launcher_handler.h"
+#include "chrome/browser/ui/webui/foreign_session_handler.h"
+#include "chrome/browser/ui/webui/most_visited_handler.h"
+#include "chrome/browser/ui/webui/new_tab_page_sync_handler.h"
+#include "chrome/browser/ui/webui/ntp_login_handler.h"
+#include "chrome/browser/ui/webui/ntp_resource_cache.h"
+#include "chrome/browser/ui/webui/shown_sections_handler.h"
+#include "chrome/browser/ui/webui/theme_source.h"
+#include "chrome/browser/ui/webui/tips_handler.h"
+#include "chrome/browser/ui/webui/value_helper.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/notification_service.h"
diff --git a/chrome/browser/ui/webui/new_tab_ui.h b/chrome/browser/ui/webui/new_tab_ui.h
index 005482c..9160a58 100644
--- a/chrome/browser/ui/webui/new_tab_ui.h
+++ b/chrome/browser/ui/webui/new_tab_ui.h
@@ -11,7 +11,7 @@
 #include "base/gtest_prod_util.h"
 #include "base/timer.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "content/browser/webui/web_ui.h"
diff --git a/chrome/browser/webui/ntp_login_handler.cc b/chrome/browser/ui/webui/ntp_login_handler.cc
index d8206f3..3b6c967 100644
--- a/chrome/browser/webui/ntp_login_handler.cc
+++ b/chrome/browser/ui/webui/ntp_login_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/webui/ntp_login_handler.h"
+#include "chrome/browser/ui/webui/ntp_login_handler.h"
 
 #include <string>
 
diff --git a/chrome/browser/webui/ntp_login_handler.h b/chrome/browser/ui/webui/ntp_login_handler.h
index 2f0a417..27b0815 100644
--- a/chrome/browser/webui/ntp_login_handler.h
+++ b/chrome/browser/ui/webui/ntp_login_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_WEBUI_NTP_LOGIN_HANDLER_H_
-#define CHROME_BROWSER_WEBUI_NTP_LOGIN_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_NTP_LOGIN_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_NTP_LOGIN_HANDLER_H_
 #pragma once
 
 #include "chrome/browser/prefs/pref_member.h"
@@ -39,4 +39,4 @@ class NTPLoginHandler : public WebUIMessageHandler,
   StringPrefMember username_pref_;
 };
 
-#endif  // CHROME_BROWSER_WEBUI_NTP_LOGIN_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_NTP_LOGIN_HANDLER_H_
diff --git a/chrome/browser/webui/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp_resource_cache.cc
index b78462b..3f2a340 100644
--- a/chrome/browser/webui/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp_resource_cache.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/webui/ntp_resource_cache.h"
+#include "chrome/browser/ui/webui/ntp_resource_cache.h"
 
 #include <algorithm>
 #include <vector>
@@ -20,9 +20,9 @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/shown_sections_handler.h"
 #include "chrome/browser/web_resource/promo_resource_service.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
-#include "chrome/browser/webui/shown_sections_handler.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
diff --git a/chrome/browser/webui/ntp_resource_cache.h b/chrome/browser/ui/webui/ntp_resource_cache.h
index cb46270..58af3ba 100644
--- a/chrome/browser/webui/ntp_resource_cache.h
+++ b/chrome/browser/ui/webui/ntp_resource_cache.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_WEBUI_NTP_RESOURCE_CACHE_H_
-#define CHROME_BROWSER_WEBUI_NTP_RESOURCE_CACHE_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_NTP_RESOURCE_CACHE_H_
+#define CHROME_BROWSER_UI_WEBUI_NTP_RESOURCE_CACHE_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -49,4 +49,4 @@ class NTPResourceCache : public NotificationObserver {
   DISALLOW_COPY_AND_ASSIGN(NTPResourceCache);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_NTP_RESOURCE_CACHE_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_NTP_RESOURCE_CACHE_H_
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 19baa57..a64f2d4 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -22,9 +22,9 @@
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/ui/options/options_window.h"
+#include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/browser/ui/webui/options/dom_options_util.h"
 #include "chrome/browser/ui/webui/options/options_managed_banner_handler.h"
-#include "chrome/browser/webui/favicon_source.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "grit/chromium_strings.h"
diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc
index e2b6c05..22d68d4 100644
--- a/chrome/browser/ui/webui/options/options_ui.cc
+++ b/chrome/browser/ui/webui/options/options_ui.cc
@@ -40,7 +40,7 @@
 #include "chrome/browser/ui/webui/options/personal_options_handler.h"
 #include "chrome/browser/ui/webui/options/search_engine_manager_handler.h"
 #include "chrome/browser/ui/webui/options/stop_syncing_handler.h"
-#include "chrome/browser/webui/theme_source.h"
+#include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/time_format.h"
diff --git a/chrome/browser/ui/webui/options/options_ui.h b/chrome/browser/ui/webui/options/options_ui.h
index f912b6c..ee433ee 100644
--- a/chrome/browser/ui/webui/options/options_ui.h
+++ b/chrome/browser/ui/webui/options/options_ui.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/scoped_ptr.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_type.h"
diff --git a/chrome/browser/ui/webui/plugins_ui.cc b/chrome/browser/ui/webui/plugins_ui.cc
index fed678c..76346e4 100644
--- a/chrome/browser/ui/webui/plugins_ui.cc
+++ b/chrome/browser/ui/webui/plugins_ui.cc
@@ -21,7 +21,7 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/notification_service.h"
diff --git a/chrome/browser/webui/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview_handler.cc
index 320ee99..65a39ed 100644
--- a/chrome/browser/webui/print_preview_handler.cc
+++ b/chrome/browser/ui/webui/print_preview_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/webui/print_preview_handler.h"
+#include "chrome/browser/ui/webui/print_preview_handler.h"
 
 #include "base/values.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
diff --git a/chrome/browser/webui/print_preview_handler.h b/chrome/browser/ui/webui/print_preview_handler.h
index 864d823..81b1b88 100644
--- a/chrome/browser/webui/print_preview_handler.h
+++ b/chrome/browser/ui/webui/print_preview_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_WEBUI_PRINT_PREVIEW_HANDLER_H_
-#define CHROME_BROWSER_WEBUI_PRINT_PREVIEW_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_HANDLER_H_
 #pragma once
 
 #include "base/ref_counted.h"
@@ -37,4 +37,4 @@ class PrintPreviewHandler : public WebUIMessageHandler,
   DISALLOW_COPY_AND_ASSIGN(PrintPreviewHandler);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_PRINT_PREVIEW_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_HANDLER_H_
diff --git a/chrome/browser/ui/webui/print_preview_ui.cc b/chrome/browser/ui/webui/print_preview_ui.cc
index 8cb2212..a9d8511 100644
--- a/chrome/browser/ui/webui/print_preview_ui.cc
+++ b/chrome/browser/ui/webui/print_preview_ui.cc
@@ -8,8 +8,8 @@
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/ui/webui/print_preview_handler.h"
 #include "chrome/browser/ui/webui/print_preview_ui_html_source.h"
-#include "chrome/browser/webui/print_preview_handler.h"
 
 PrintPreviewUI::PrintPreviewUI(TabContents* contents)
     : WebUI(contents),
diff --git a/chrome/browser/ui/webui/print_preview_ui_html_source.h b/chrome/browser/ui/webui/print_preview_ui_html_source.h
index 2f9f8b8..ce92773 100644
--- a/chrome/browser/ui/webui/print_preview_ui_html_source.h
+++ b/chrome/browser/ui/webui/print_preview_ui_html_source.h
@@ -9,7 +9,7 @@
 #include <string>
 #include <utility>
 
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 
 namespace base {
 class SharedMemory;
diff --git a/chrome/browser/ui/webui/remoting_ui.cc b/chrome/browser/ui/webui/remoting_ui.cc
index 654894a..f11642f 100644
--- a/chrome/browser/ui/webui/remoting_ui.cc
+++ b/chrome/browser/ui/webui/remoting_ui.cc
@@ -8,7 +8,7 @@
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/url_constants.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/browser/webui/screenshot_source.cc b/chrome/browser/ui/webui/screenshot_source.cc
index e7b88c0..6c1269c 100644
--- a/chrome/browser/webui/screenshot_source.cc
+++ b/chrome/browser/ui/webui/screenshot_source.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/webui/screenshot_source.h"
+#include "chrome/browser/ui/webui/screenshot_source.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
diff --git a/chrome/browser/webui/screenshot_source.h b/chrome/browser/ui/webui/screenshot_source.h
index b578c01..e4f77a4 100644
--- a/chrome/browser/webui/screenshot_source.h
+++ b/chrome/browser/ui/webui/screenshot_source.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_WEBUI_SCREENSHOT_SOURCE_H_
-#define CHROME_BROWSER_WEBUI_SCREENSHOT_SOURCE_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_SCREENSHOT_SOURCE_H_
+#define CHROME_BROWSER_UI_WEBUI_SCREENSHOT_SOURCE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 
 // ScreenshotSource is the data source that serves screenshots (saved
 // or current) to the bug report html ui
@@ -36,4 +36,4 @@ class ScreenshotSource : public ChromeURLDataManager::DataSource {
   DISALLOW_COPY_AND_ASSIGN(ScreenshotSource);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_SCREENSHOT_SOURCE_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_SCREENSHOT_SOURCE_H_
diff --git a/chrome/browser/webui/settings_browsertest.cc b/chrome/browser/ui/webui/settings_browsertest.cc
index 06019b3..06019b3 100644
--- a/chrome/browser/webui/settings_browsertest.cc
+++ b/chrome/browser/ui/webui/settings_browsertest.cc
diff --git a/chrome/browser/webui/shared_resources_data_source.cc b/chrome/browser/ui/webui/shared_resources_data_source.cc
index eeddacd..dbcf43f 100644
--- a/chrome/browser/webui/shared_resources_data_source.cc
+++ b/chrome/browser/ui/webui/shared_resources_data_source.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/webui/shared_resources_data_source.h"
+#include "chrome/browser/ui/webui/shared_resources_data_source.h"
 
 #include <string>
 
@@ -10,7 +10,7 @@
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/io_thread.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/url_constants.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/webui/shared_resources_data_source.h b/chrome/browser/ui/webui/shared_resources_data_source.h
index 5547458..f70d0e9 100644
--- a/chrome/browser/webui/shared_resources_data_source.h
+++ b/chrome/browser/ui/webui/shared_resources_data_source.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_WEBUI_SHARED_RESOURCES_DATA_SOURCE_H_
-#define CHROME_BROWSER_WEBUI_SHARED_RESOURCES_DATA_SOURCE_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_SHARED_RESOURCES_DATA_SOURCE_H_
+#define CHROME_BROWSER_UI_WEBUI_SHARED_RESOURCES_DATA_SOURCE_H_
 #pragma once
 
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 
 namespace net {
 class URLRequest;
@@ -32,4 +32,4 @@ class SharedResourcesDataSource : public ChromeURLDataManager::DataSource {
   DISALLOW_COPY_AND_ASSIGN(SharedResourcesDataSource);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_SHARED_RESOURCES_DATA_SOURCE_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_SHARED_RESOURCES_DATA_SOURCE_H_
diff --git a/chrome/browser/webui/shown_sections_handler.cc b/chrome/browser/ui/webui/shown_sections_handler.cc
index 9790ffb..ff1d926b 100644
--- a/chrome/browser/webui/shown_sections_handler.cc
+++ b/chrome/browser/ui/webui/shown_sections_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/webui/shown_sections_handler.h"
+#include "chrome/browser/ui/webui/shown_sections_handler.h"
 
 #include <string>
 
diff --git a/chrome/browser/webui/shown_sections_handler.h b/chrome/browser/ui/webui/shown_sections_handler.h
index 6abf177..86f9b0d 100644
--- a/chrome/browser/webui/shown_sections_handler.h
+++ b/chrome/browser/ui/webui/shown_sections_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_WEBUI_SHOWN_SECTIONS_HANDLER_H_
-#define CHROME_BROWSER_WEBUI_SHOWN_SECTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_SHOWN_SECTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_SHOWN_SECTIONS_HANDLER_H_
 #pragma once
 
 #include "chrome/browser/prefs/pref_change_registrar.h"
@@ -76,4 +76,4 @@ class ShownSectionsHandler : public WebUIMessageHandler,
   DISALLOW_COPY_AND_ASSIGN(ShownSectionsHandler);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_SHOWN_SECTIONS_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_SHOWN_SECTIONS_HANDLER_H_
diff --git a/chrome/browser/webui/shown_sections_handler_unittest.cc b/chrome/browser/ui/webui/shown_sections_handler_unittest.cc
index fce8b6c..ee647a5 100644
--- a/chrome/browser/webui/shown_sections_handler_unittest.cc
+++ b/chrome/browser/ui/webui/shown_sections_handler_unittest.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/webui/shown_sections_handler.h"
+#include "chrome/browser/ui/webui/shown_sections_handler.h"
 
 #include "base/scoped_ptr.h"
 #include "chrome/browser/prefs/pref_value_store.h"
diff --git a/chrome/browser/ui/webui/slideshow_ui.cc b/chrome/browser/ui/webui/slideshow_ui.cc
index b8080ea..39e139e 100644
--- a/chrome/browser/ui/webui/slideshow_ui.cc
+++ b/chrome/browser/ui/webui/slideshow_ui.cc
@@ -20,7 +20,7 @@
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/webui/favicon_source.h"
+#include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/webui/sync_internals_html_source.cc b/chrome/browser/ui/webui/sync_internals_html_source.cc
index 727ca6b..c83202c 100644
--- a/chrome/browser/webui/sync_internals_html_source.cc
+++ b/chrome/browser/ui/webui/sync_internals_html_source.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/webui/sync_internals_html_source.h"
+#include "chrome/browser/ui/webui/sync_internals_html_source.h"
 
 #include <algorithm>
 
diff --git a/chrome/browser/webui/sync_internals_html_source.h b/chrome/browser/ui/webui/sync_internals_html_source.h
index ad5a130..2afe5d0 100644
--- a/chrome/browser/webui/sync_internals_html_source.h
+++ b/chrome/browser/ui/webui/sync_internals_html_source.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_WEBUI_SYNC_INTERNALS_HTML_SOURCE_H_
-#define CHROME_BROWSER_WEBUI_SYNC_INTERNALS_HTML_SOURCE_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_SYNC_INTERNALS_HTML_SOURCE_H_
+#define CHROME_BROWSER_UI_WEBUI_SYNC_INTERNALS_HTML_SOURCE_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 
 class SyncInternalsHTMLSource : public ChromeURLDataManager::DataSource {
  public:
@@ -28,4 +28,4 @@ class SyncInternalsHTMLSource : public ChromeURLDataManager::DataSource {
   DISALLOW_COPY_AND_ASSIGN(SyncInternalsHTMLSource);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_SYNC_INTERNALS_HTML_SOURCE_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_SYNC_INTERNALS_HTML_SOURCE_H_
diff --git a/chrome/browser/ui/webui/sync_internals_ui.cc b/chrome/browser/ui/webui/sync_internals_ui.cc
index 5edfbcc..3a17d6f 100644
--- a/chrome/browser/ui/webui/sync_internals_ui.cc
+++ b/chrome/browser/ui/webui/sync_internals_ui.cc
@@ -17,8 +17,8 @@
 #include "chrome/browser/sync/js_frontend.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_ui_util.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
-#include "chrome/browser/webui/sync_internals_html_source.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/sync_internals_html_source.h"
 #include "chrome/common/render_messages_params.h"
 
 SyncInternalsUI::SyncInternalsUI(TabContents* contents)
diff --git a/chrome/browser/ui/webui/textfields_ui.h b/chrome/browser/ui/webui/textfields_ui.h
index 1b62982..4ce9ef8 100644
--- a/chrome/browser/ui/webui/textfields_ui.h
+++ b/chrome/browser/ui/webui/textfields_ui.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "content/browser/webui/web_ui.h"
 
 class RefCountedMemory;
diff --git a/chrome/browser/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc
index 89529cc..de02260 100644
--- a/chrome/browser/webui/theme_source.cc
+++ b/chrome/browser/ui/webui/theme_source.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/webui/theme_source.h"
+#include "chrome/browser/ui/webui/theme_source.h"
 
 #include "base/message_loop.h"
 #include "base/ref_counted_memory.h"
@@ -10,7 +10,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/resources_util.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
-#include "chrome/browser/webui/ntp_resource_cache.h"
+#include "chrome/browser/ui/webui/ntp_resource_cache.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/browser/webui/theme_source.h b/chrome/browser/ui/webui/theme_source.h
index 95e9af7..037bb83 100644
--- a/chrome/browser/webui/theme_source.h
+++ b/chrome/browser/ui/webui/theme_source.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_WEBUI_THEME_SOURCE_H_
-#define CHROME_BROWSER_WEBUI_THEME_SOURCE_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_THEME_SOURCE_H_
+#define CHROME_BROWSER_UI_WEBUI_THEME_SOURCE_H_
 #pragma once
 
 #include <string>
 
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 
 class Profile;
 class RefCountedBytes;
@@ -45,4 +45,4 @@ class ThemeSource : public ChromeURLDataManager::DataSource {
   DISALLOW_COPY_AND_ASSIGN(ThemeSource);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_THEME_SOURCE_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_THEME_SOURCE_H_
diff --git a/chrome/browser/webui/theme_source_unittest.cc b/chrome/browser/ui/webui/theme_source_unittest.cc
index 47a6453..9c1a132 100644
--- a/chrome/browser/webui/theme_source_unittest.cc
+++ b/chrome/browser/ui/webui/theme_source_unittest.cc
@@ -6,7 +6,7 @@
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
-#include "chrome/browser/webui/theme_source.h"
+#include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/testing_profile.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/webui/thumbnail_source.cc b/chrome/browser/ui/webui/thumbnail_source.cc
index dd30151..3123e21 100644
--- a/chrome/browser/webui/thumbnail_source.cc
+++ b/chrome/browser/ui/webui/thumbnail_source.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/webui/thumbnail_source.h"
+#include "chrome/browser/ui/webui/thumbnail_source.h"
 
 #include "base/callback.h"
 #include "chrome/browser/history/top_sites.h"
diff --git a/chrome/browser/webui/thumbnail_source.h b/chrome/browser/ui/webui/thumbnail_source.h
index 49c31a9..f0dc701 100644
--- a/chrome/browser/webui/thumbnail_source.h
+++ b/chrome/browser/ui/webui/thumbnail_source.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_WEBUI_THUMBNAIL_SOURCE_H_
-#define CHROME_BROWSER_WEBUI_THUMBNAIL_SOURCE_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_THUMBNAIL_SOURCE_H_
+#define CHROME_BROWSER_UI_WEBUI_THUMBNAIL_SOURCE_H_
 #pragma once
 
 #include <string>
@@ -11,7 +11,7 @@
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "base/ref_counted_memory.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 
 class Profile;
 
@@ -51,4 +51,4 @@ class ThumbnailSource : public ChromeURLDataManager::DataSource {
   DISALLOW_COPY_AND_ASSIGN(ThumbnailSource);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_THUMBNAIL_SOURCE_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_THUMBNAIL_SOURCE_H_
diff --git a/chrome/browser/webui/tips_handler.cc b/chrome/browser/ui/webui/tips_handler.cc
index 663b3be..c3f9d41 100644
--- a/chrome/browser/webui/tips_handler.cc
+++ b/chrome/browser/ui/webui/tips_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/webui/tips_handler.h"
+#include "chrome/browser/ui/webui/tips_handler.h"
 
 #include <string>
 
diff --git a/chrome/browser/webui/tips_handler.h b/chrome/browser/ui/webui/tips_handler.h
index 802465d..2735d49 100644
--- a/chrome/browser/webui/tips_handler.h
+++ b/chrome/browser/ui/webui/tips_handler.h
@@ -6,8 +6,8 @@
 // has been stored in the user's preferences file.  Used mainly
 // by the suggestions and tips area of the new tab page.
 
-#ifndef CHROME_BROWSER_WEBUI_TIPS_HANDLER_H_
-#define CHROME_BROWSER_WEBUI_TIPS_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_TIPS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_TIPS_HANDLER_H_
 #pragma once
 
 #include <string>
@@ -52,5 +52,5 @@ class TipsHandler : public WebUIMessageHandler {
   DISALLOW_COPY_AND_ASSIGN(TipsHandler);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_TIPS_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_TIPS_HANDLER_H_
 
diff --git a/chrome/browser/webui/value_helper.cc b/chrome/browser/ui/webui/value_helper.cc
index ca8c532..bb622f4 100644
--- a/chrome/browser/webui/value_helper.cc
+++ b/chrome/browser/ui/webui/value_helper.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/webui/value_helper.h"
+#include "chrome/browser/ui/webui/value_helper.h"
 
 #include "chrome/browser/ui/webui/new_tab_ui.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/webui/value_helper.h b/chrome/browser/ui/webui/value_helper.h
index 4a0706f..ea445fc 100644
--- a/chrome/browser/webui/value_helper.h
+++ b/chrome/browser/ui/webui/value_helper.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_WEBUI_VALUE_HELPER_H_
-#define CHROME_BROWSER_WEBUI_VALUE_HELPER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_VALUE_HELPER_H_
+#define CHROME_BROWSER_UI_WEBUI_VALUE_HELPER_H_
 #pragma once
 
 #include "chrome/browser/sessions/tab_restore_service.h"
@@ -21,5 +21,5 @@ class ValueHelper {
   DISALLOW_IMPLICIT_CONSTRUCTORS(ValueHelper);
 };
 
-#endif  // CHROME_BROWSER_WEBUI_VALUE_HELPER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_VALUE_HELPER_H_
 
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index ad277b7..2ecd6bc 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3239,38 +3239,64 @@
         'browser/ui/views/window.h',
         'browser/ui/views/wrench_menu.cc',
         'browser/ui/views/wrench_menu.h',
+        'browser/ui/webui/app_launcher_handler.cc',
+        'browser/ui/webui/app_launcher_handler.h',
         'browser/ui/webui/bookmarks_ui.cc',
         'browser/ui/webui/bookmarks_ui.h',
         'browser/ui/webui/bug_report_ui.cc',
         'browser/ui/webui/bug_report_ui.h',
+        'browser/ui/webui/chrome_url_data_manager_backend.cc',
+        'browser/ui/webui/chrome_url_data_manager_backend.h',
+        'browser/ui/webui/chrome_url_data_manager.cc',
+        'browser/ui/webui/chrome_url_data_manager.h',
         'browser/ui/webui/constrained_html_ui.cc',
         'browser/ui/webui/constrained_html_ui.h',
         'browser/ui/webui/crashes_ui.cc',
         'browser/ui/webui/crashes_ui.h',
         'browser/ui/webui/devtools_ui.cc',
         'browser/ui/webui/devtools_ui.h',
+        'browser/ui/webui/downloads_dom_handler.cc',
+        'browser/ui/webui/downloads_dom_handler.h',
         'browser/ui/webui/downloads_ui.cc',
         'browser/ui/webui/downloads_ui.h',
+        'browser/ui/webui/favicon_source.cc',
+        'browser/ui/webui/favicon_source.h',
+        'browser/ui/webui/fileicon_source.cc',
+        'browser/ui/webui/fileicon_source.h',
         'browser/ui/webui/filebrowse_ui.cc',
         'browser/ui/webui/filebrowse_ui.h',
         'browser/ui/webui/flags_ui.cc',
         'browser/ui/webui/flags_ui.h',
+        'browser/ui/webui/foreign_session_handler.cc',
+        'browser/ui/webui/foreign_session_handler.h',
+        'browser/ui/webui/generic_handler.cc',
+        'browser/ui/webui/generic_handler.h',
         'browser/ui/webui/gpu_internals_ui.cc',
         'browser/ui/webui/gpu_internals_ui.h',
         'browser/ui/webui/history2_ui.cc',
         'browser/ui/webui/history2_ui.h',
         'browser/ui/webui/history_ui.cc',
         'browser/ui/webui/history_ui.h',
+        'browser/ui/webui/html_dialog_tab_contents_delegate.cc',
+        'browser/ui/webui/html_dialog_tab_contents_delegate.h',
         'browser/ui/webui/html_dialog_ui.cc',
         'browser/ui/webui/html_dialog_ui.h',
         'browser/ui/webui/keyboard_ui.cc',
         'browser/ui/webui/keyboard_ui.h',
         'browser/ui/webui/mediaplayer_ui.cc',
         'browser/ui/webui/mediaplayer_ui.h',
+        'browser/ui/webui/most_visited_handler.cc',
+        'browser/ui/webui/most_visited_handler.h',
         'browser/ui/webui/net_internals_ui.cc',
         'browser/ui/webui/net_internals_ui.h',
+        'browser/ui/webui/new_tab_page_sync_handler.cc',
+        'browser/ui/webui/new_tab_page_sync_handler.h',
         'browser/ui/webui/new_tab_ui.cc',
         'browser/ui/webui/new_tab_ui.h',
+        'browser/ui/webui/ntp_login_handler.cc',
+        'browser/ui/webui/ntp_login_handler.h',
+        'browser/ui/webui/ntp_resource_cache.cc',
+        'browser/ui/webui/ntp_resource_cache.h',
         'browser/ui/webui/options/about_page_handler.cc',
         'browser/ui/webui/options/about_page_handler.h',
         'browser/ui/webui/options/add_startup_page_handler.cc',
@@ -3323,18 +3349,36 @@
         'browser/ui/webui/options/stop_syncing_handler.h',
         'browser/ui/webui/plugins_ui.cc',
         'browser/ui/webui/plugins_ui.h',
+        'browser/ui/webui/print_preview_handler.cc',
+        'browser/ui/webui/print_preview_handler.h',
         'browser/ui/webui/print_preview_ui.cc',
         'browser/ui/webui/print_preview_ui.h',
         'browser/ui/webui/print_preview_ui_html_source.cc',
         'browser/ui/webui/print_preview_ui_html_source.h',
         'browser/ui/webui/remoting_ui.cc',
         'browser/ui/webui/remoting_ui.h',
+        'browser/ui/webui/screenshot_source.cc',
+        'browser/ui/webui/screenshot_source.h',
+        'browser/ui/webui/shared_resources_data_source.cc',
+        'browser/ui/webui/shared_resources_data_source.h',
+        'browser/ui/webui/shown_sections_handler.cc',
+        'browser/ui/webui/shown_sections_handler.h',
         'browser/ui/webui/slideshow_ui.cc',
         'browser/ui/webui/slideshow_ui.h',
+        'browser/ui/webui/sync_internals_html_source.cc',
+        'browser/ui/webui/sync_internals_html_source.h',
         'browser/ui/webui/sync_internals_ui.cc',
         'browser/ui/webui/sync_internals_ui.h',
         'browser/ui/webui/textfields_ui.cc',
         'browser/ui/webui/textfields_ui.h',
+        'browser/ui/webui/theme_source.cc',
+        'browser/ui/webui/theme_source.h',
+        'browser/ui/webui/thumbnail_source.cc',
+        'browser/ui/webui/thumbnail_source.h',
+        'browser/ui/webui/tips_handler.cc',
+        'browser/ui/webui/tips_handler.h',
+        'browser/ui/webui/value_helper.cc',
+        'browser/ui/webui/value_helper.h',
         'browser/ui/window_sizer.cc',
         'browser/ui/window_sizer.h',
         'browser/ui/window_sizer_linux.cc',
@@ -3372,50 +3416,6 @@
         'browser/webdata/web_database.cc',
         'browser/webdata/web_database.h',
         'browser/webdata/web_database_win.cc',
-        'browser/webui/app_launcher_handler.cc',
-        'browser/webui/app_launcher_handler.h',
-        'browser/webui/chrome_url_data_manager_backend.cc',
-        'browser/webui/chrome_url_data_manager_backend.h',
-        'browser/webui/chrome_url_data_manager.cc',
-        'browser/webui/chrome_url_data_manager.h',
-        'browser/webui/downloads_dom_handler.cc',
-        'browser/webui/downloads_dom_handler.h',
-        'browser/webui/favicon_source.cc',
-        'browser/webui/favicon_source.h',
-        'browser/webui/fileicon_source.cc',
-        'browser/webui/fileicon_source.h',
-        'browser/webui/foreign_session_handler.cc',
-        'browser/webui/foreign_session_handler.h',
-        'browser/webui/generic_handler.cc',
-        'browser/webui/generic_handler.h',
-        'browser/webui/html_dialog_tab_contents_delegate.cc',
-        'browser/webui/html_dialog_tab_contents_delegate.h',
-        'browser/webui/most_visited_handler.cc',
-        'browser/webui/most_visited_handler.h',
-        'browser/webui/new_tab_page_sync_handler.cc',
-        'browser/webui/new_tab_page_sync_handler.h',
-        'browser/webui/ntp_login_handler.cc',
-        'browser/webui/ntp_login_handler.h',
-        'browser/webui/ntp_resource_cache.cc',
-        'browser/webui/ntp_resource_cache.h',
-        'browser/webui/print_preview_handler.cc',
-        'browser/webui/print_preview_handler.h',
-        'browser/webui/screenshot_source.cc',
-        'browser/webui/screenshot_source.h',
-        'browser/webui/shared_resources_data_source.cc',
-        'browser/webui/shared_resources_data_source.h',
-        'browser/webui/shown_sections_handler.cc',
-        'browser/webui/shown_sections_handler.h',
-        'browser/webui/sync_internals_html_source.cc',
-        'browser/webui/sync_internals_html_source.h',
-        'browser/webui/theme_source.cc',
-        'browser/webui/theme_source.h',
-        'browser/webui/thumbnail_source.cc',
-        'browser/webui/thumbnail_source.h',
-        'browser/webui/tips_handler.cc',
-        'browser/webui/tips_handler.h',
-        'browser/webui/value_helper.cc',
-        'browser/webui/value_helper.h',
         'browser/worker_host/message_port_service.cc',
         'browser/worker_host/message_port_service.h',
         'browser/worker_host/worker_document_set.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 67d3ed8..613ec71 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1722,9 +1722,12 @@
         'browser/ui/views/reload_button_unittest.cc',
         'browser/ui/views/shell_dialogs_win_unittest.cc',
         'browser/ui/views/status_icons/status_tray_win_unittest.cc',
+        'browser/ui/webui/html_dialog_tab_contents_delegate_unittest.cc',
         'browser/ui/webui/options/language_options_handler_unittest.cc',
         'browser/ui/webui/print_preview_ui_html_source_unittest.cc',
+        'browser/ui/webui/shown_sections_handler_unittest.cc',
         'browser/ui/webui/sync_internals_ui_unittest.cc',
+        'browser/ui/webui/theme_source_unittest.cc',
         'browser/ui/window_sizer_unittest.cc',
         'browser/ui/window_snapshot/window_snapshot_mac_unittest.mm',
         'browser/user_style_sheet_watcher_unittest.cc',
@@ -1733,9 +1736,6 @@
         'browser/webdata/web_data_service_test_util.h',
         'browser/webdata/web_data_service_unittest.cc',
         'browser/webdata/web_database_unittest.cc',
-        'browser/webui/html_dialog_tab_contents_delegate_unittest.cc',
-        'browser/webui/shown_sections_handler_unittest.cc',
-        'browser/webui/theme_source_unittest.cc',
         'browser/web_resource/promo_resource_service_unittest.cc',
         'common/bzip2_unittest.cc',
         'common/child_process_logging_mac_unittest.mm',
@@ -2292,9 +2292,9 @@
         'browser/ui/views/browser_actions_container_browsertest.cc',
         'browser/ui/views/dom_view_browsertest.cc',
         'browser/ui/views/html_dialog_view_browsertest.cc',
-        'browser/webui/file_browse_browsertest.cc',
-        'browser/webui/mediaplayer_browsertest.cc',
-        'browser/webui/settings_browsertest.cc',
+        'browser/ui/webui/file_browse_browsertest.cc',
+        'browser/ui/webui/mediaplayer_browsertest.cc',
+        'browser/ui/webui/settings_browsertest.cc',
         'renderer/autofill/form_autocomplete_browsertest.cc',
         'renderer/autofill/form_manager_browsertest.cc',
         'renderer/autofill/password_autofill_manager_unittest.cc',
@@ -2337,8 +2337,8 @@
             ['exclude', '^browser/chromeos'],
           ],
           'sources!': [
-            'browser/webui/file_browse_browsertest.cc',
-            'browser/webui/mediaplayer_browsertest.cc',
+            'browser/ui/webui/file_browse_browsertest.cc',
+            'browser/ui/webui/mediaplayer_browsertest.cc',
           ],
         }],
         ['toolkit_views==0', {
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc
index 892a29e..cff223a 100644
--- a/chrome/test/testing_profile.cc
+++ b/chrome/test/testing_profile.cc
@@ -36,8 +36,8 @@
 #include "chrome/browser/sync/profile_sync_service_mock.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
 #include "chrome/browser/ui/find_bar/find_bar_state.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
-#include "chrome/browser/webui/ntp_resource_cache.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/ntp_resource_cache.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/net/url_request_context_getter.h"
 #include "chrome/common/notification_service.h"
diff --git a/content/browser/webui/web_ui.cc b/content/browser/webui/web_ui.cc
index 11e346e..4085279 100644
--- a/content/browser/webui/web_ui.cc
+++ b/content/browser/webui/web_ui.cc
@@ -15,7 +15,7 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
-#include "chrome/browser/webui/generic_handler.h"
+#include "chrome/browser/ui/webui/generic_handler.h"
 #include "chrome/common/bindings_policy.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
author	tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2011-02-27 19:33:36 +0000
committer	tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2011-02-27 19:33:36 +0000
commit	fd42ac30f127624def51d949e21f9776b0e6d257 (patch)
tree	690ae7b46b66bbc03051b460ca5ee66a6665554f
parent	8ea6a9e57e924dabe697cbf73b6fda59c6297664 (diff)
download	chromium_src-fd42ac30f127624def51d949e21f9776b0e6d257.zip chromium_src-fd42ac30f127624def51d949e21f9776b0e6d257.tar.gz chromium_src-fd42ac30f127624def51d949e21f9776b0e6d257.tar.bz2