WebUI: Move more files from chrome/browser/webui to chrome/browser/ui/webui.
I'm moving the files I have found with:
$ ls chrome/browser/webui | grep _ui
BUG=59946
TEST=trybots
Review URL: http://codereview.chromium.org/6599024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76183 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/autocomplete/autocomplete.cc b/chrome/browser/autocomplete/autocomplete.cc
index e62ae983..3ae1eb9 100644
--- a/chrome/browser/autocomplete/autocomplete.cc
+++ b/chrome/browser/autocomplete/autocomplete.cc
@@ -25,7 +25,7 @@
#include "chrome/browser/net/url_fixer_upper.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/webui/history_ui.h"
+#include "chrome/browser/ui/webui/history_ui.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/notification_service.h"
#include "chrome/common/pref_names.h"
diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc
index 681a287..2d574ff 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/new_tab_ui.h"
#include "chrome/browser/webui/app_launcher_handler.h"
#include "chrome/browser/webui/most_visited_handler.h"
-#include "chrome/browser/webui/new_tab_ui.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_signin.cc b/chrome/browser/browser_signin.cc
index c23955f..15163e73 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/constrained_html_ui.h"
+#include "chrome/browser/ui/webui/html_dialog_ui.h"
#include "chrome/browser/webui/chrome_url_data_manager.h"
-#include "chrome/browser/webui/constrained_html_ui.h"
-#include "chrome/browser/webui/html_dialog_ui.h"
#include "chrome/common/jstemplate_builder.h"
#include "chrome/common/notification_details.h"
#include "chrome/common/notification_source.h"
diff --git a/chrome/browser/chrome_plugin_host.cc b/chrome/browser/chrome_plugin_host.cc
index da384aa..eaf3b35 100644
--- a/chrome/browser/chrome_plugin_host.cc
+++ b/chrome/browser/chrome_plugin_host.cc
@@ -27,7 +27,7 @@
#include "chrome/browser/plugin_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/renderer_host/render_process_host.h"
-#include "chrome/browser/webui/html_dialog_ui.h"
+#include "chrome/browser/ui/webui/html_dialog_ui.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_counters.h"
#include "chrome/common/chrome_paths.h"
diff --git a/chrome/browser/chromeos/login/login_html_dialog.h b/chrome/browser/chromeos/login/login_html_dialog.h
index 4d95756..c8e894f 100644
--- a/chrome/browser/chromeos/login/login_html_dialog.h
+++ b/chrome/browser/chromeos/login/login_html_dialog.h
@@ -8,7 +8,7 @@
#include <string>
-#include "chrome/browser/webui/html_dialog_ui.h"
+#include "chrome/browser/ui/webui/html_dialog_ui.h"
#include "chrome/common/notification_observer.h"
#include "chrome/common/notification_registrar.h"
#include "ui/gfx/native_widget_types.h"
diff --git a/chrome/browser/chromeos/usb_mount_observer.cc b/chrome/browser/chromeos/usb_mount_observer.cc
index 7e0a68b..d715379 100644
--- a/chrome/browser/chromeos/usb_mount_observer.cc
+++ b/chrome/browser/chromeos/usb_mount_observer.cc
@@ -11,7 +11,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/filebrowse_ui.h"
+#include "chrome/browser/ui/webui/filebrowse_ui.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/url_constants.h"
diff --git a/chrome/browser/chromeos/usb_mount_observer_browsertest.cc b/chrome/browser/chromeos/usb_mount_observer_browsertest.cc
index 7e44b1c..f95d73d 100644
--- a/chrome/browser/chromeos/usb_mount_observer_browsertest.cc
+++ b/chrome/browser/chromeos/usb_mount_observer_browsertest.cc
@@ -9,7 +9,7 @@
#include "chrome/browser/chromeos/usb_mount_observer.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/webui/mediaplayer_ui.h"
+#include "chrome/browser/ui/webui/mediaplayer_ui.h"
#include "chrome/common/url_constants.h"
#include "chrome/test/automation/dom_element_proxy.h"
#include "chrome/test/in_process_browser_test.h"
diff --git a/chrome/browser/chromeos/webui/keyboard_overlay_ui.h b/chrome/browser/chromeos/webui/keyboard_overlay_ui.h
index 8cb062f..7245665 100644
--- a/chrome/browser/chromeos/webui/keyboard_overlay_ui.h
+++ b/chrome/browser/chromeos/webui/keyboard_overlay_ui.h
@@ -8,7 +8,7 @@
#include <string>
-#include "chrome/browser/webui/html_dialog_ui.h"
+#include "chrome/browser/ui/webui/html_dialog_ui.h"
class Browser;
class Profile;
diff --git a/chrome/browser/download/download_shelf.cc b/chrome/browser/download/download_shelf.cc
index be1e82a..5f07ce2c 100644
--- a/chrome/browser/download/download_shelf.cc
+++ b/chrome/browser/download/download_shelf.cc
@@ -10,7 +10,7 @@
#include "chrome/browser/download/download_manager.h"
#include "chrome/browser/download/download_util.h"
#include "chrome/browser/metrics/user_metrics.h"
-#include "chrome/browser/webui/downloads_ui.h"
+#include "chrome/browser/ui/webui/downloads_ui.h"
#include "chrome/common/url_constants.h"
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/platform_util_chromeos.cc b/chrome/browser/platform_util_chromeos.cc
index 13fda8e..f307ed4 100644
--- a/chrome/browser/platform_util_chromeos.cc
+++ b/chrome/browser/platform_util_chromeos.cc
@@ -13,8 +13,8 @@
#include "chrome/browser/browser_list.h"
#include "chrome/browser/browser_thread.h"
#include "chrome/browser/tabs/tab_strip_model.h"
-#include "chrome/browser/webui/filebrowse_ui.h"
-#include "chrome/browser/webui/mediaplayer_ui.h"
+#include "chrome/browser/ui/webui/filebrowse_ui.h"
+#include "chrome/browser/ui/webui/mediaplayer_ui.h"
#include "chrome/common/process_watcher.h"
#include "googleurl/src/gurl.h"
#include "grit/generated_resources.h"
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 75596ff..3f4c1342 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -50,10 +50,10 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/webui/flags_ui.h"
+#include "chrome/browser/ui/webui/new_tab_ui.h"
+#include "chrome/browser/ui/webui/plugins_ui.h"
#include "chrome/browser/upgrade_detector.h"
-#include "chrome/browser/webui/flags_ui.h"
-#include "chrome/browser/webui/new_tab_ui.h"
-#include "chrome/browser/webui/plugins_ui.h"
#include "chrome/common/pref_names.h"
#include "content/browser/host_zoom_map.h"
diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h
index 03bf38f..11dcdf2c 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h
+++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h
@@ -9,7 +9,7 @@
#include <vector>
#include "base/time.h"
-#include "chrome/browser/webui/html_dialog_ui.h"
+#include "chrome/browser/ui/webui/html_dialog_ui.h"
#include "chrome/common/net/gaia/gaia_auth_consumer.h"
#include "chrome/common/net/gaia/gaia_auth_fetcher.h"
#include "grit/generated_resources.h"
diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_message_handler.h b/chrome/browser/printing/cloud_print/cloud_print_setup_message_handler.h
index 79b38d3f..064d508 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_setup_message_handler.h
+++ b/chrome/browser/printing/cloud_print/cloud_print_setup_message_handler.h
@@ -8,7 +8,7 @@
#include <string>
#include "base/values.h"
-#include "chrome/browser/webui/html_dialog_ui.h"
+#include "chrome/browser/ui/webui/html_dialog_ui.h"
class CloudPrintSetupFlow;
diff --git a/chrome/browser/printing/print_dialog_cloud_internal.h b/chrome/browser/printing/print_dialog_cloud_internal.h
index 8272c30..2abb2ee 100644
--- a/chrome/browser/printing/print_dialog_cloud_internal.h
+++ b/chrome/browser/printing/print_dialog_cloud_internal.h
@@ -12,7 +12,7 @@
#include "base/file_path.h"
#include "base/scoped_ptr.h"
#include "base/synchronization/lock.h"
-#include "chrome/browser/webui/html_dialog_ui.h"
+#include "chrome/browser/ui/webui/html_dialog_ui.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/printing/print_preview_message_handler.cc b/chrome/browser/printing/print_preview_message_handler.cc
index cdd7d7d..8ca6eff 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_ui.h"
+#include "chrome/browser/ui/webui/print_preview_ui_html_source.h"
#include "chrome/browser/webui/print_preview_handler.h"
-#include "chrome/browser/webui/print_preview_ui.h"
-#include "chrome/browser/webui/print_preview_ui_html_source.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/remoting/setup_flow.h b/chrome/browser/remoting/setup_flow.h
index 5672d3f..6dd31cc 100644
--- a/chrome/browser/remoting/setup_flow.h
+++ b/chrome/browser/remoting/setup_flow.h
@@ -7,7 +7,7 @@
#include "base/callback.h"
#include "base/scoped_ptr.h"
-#include "chrome/browser/webui/html_dialog_ui.h"
+#include "chrome/browser/ui/webui/html_dialog_ui.h"
#include "chrome/common/remoting/chromoting_host_info.h"
#include "content/browser/webui/web_ui.h"
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
index 8faeb9d..e543358c 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -26,7 +26,7 @@
#include "chrome/browser/tab_contents/navigation_entry.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/tab_contents/tab_util.h"
-#include "chrome/browser/webui/new_tab_ui.h"
+#include "chrome/browser/ui/webui/new_tab_ui.h"
#include "chrome/common/jstemplate_builder.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
diff --git a/chrome/browser/sync/sync_setup_flow.h b/chrome/browser/sync/sync_setup_flow.h
index b346e6e..65e0024b 100644
--- a/chrome/browser/sync/sync_setup_flow.h
+++ b/chrome/browser/sync/sync_setup_flow.h
@@ -14,7 +14,7 @@
#include "chrome/browser/sync/profile_sync_service.h"
#include "chrome/browser/sync/sync_setup_wizard.h"
#include "chrome/browser/sync/syncable/model_type.h"
-#include "chrome/browser/webui/html_dialog_ui.h"
+#include "chrome/browser/ui/webui/html_dialog_ui.h"
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/native_widget_types.h"
diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc
index c16aede..ae1c9e3 100644
--- a/chrome/browser/tabs/tab_strip_model_unittest.cc
+++ b/chrome/browser/tabs/tab_strip_model_unittest.cc
@@ -21,7 +21,7 @@
#include "chrome/browser/tabs/tab_strip_model_order_controller.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
-#include "chrome/browser/webui/new_tab_ui.h"
+#include "chrome/browser/ui/webui/new_tab_ui.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/notification_details.h"
#include "chrome/common/notification_observer_mock.h"
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 11ac4571..51ff4b54 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -84,12 +84,12 @@
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
#include "chrome/browser/ui/tabs/dock_info.h"
#include "chrome/browser/ui/tabs/tab_menu_model.h"
+#include "chrome/browser/ui/webui/bug_report_ui.h"
+#include "chrome/browser/ui/webui/filebrowse_ui.h"
#include "chrome/browser/ui/webui/options/content_settings_handler.h"
#include "chrome/browser/ui/window_sizer.h"
#include "chrome/browser/upgrade_detector.h"
#include "chrome/browser/web_applications/web_app.h"
-#include "chrome/browser/webui/bug_report_ui.h"
-#include "chrome/browser/webui/filebrowse_ui.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/content_restriction.h"
diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc
index d8cf4fc..a803d7b 100644
--- a/chrome/browser/ui/browser_init.cc
+++ b/chrome/browser/ui/browser_init.cc
@@ -93,7 +93,7 @@
#include "chrome/browser/chromeos/usb_mount_observer.h"
#include "chrome/browser/chromeos/wm_message_listener.h"
#include "chrome/browser/chromeos/wm_overview_controller.h"
-#include "chrome/browser/webui/mediaplayer_ui.h"
+#include "chrome/browser/ui/webui/mediaplayer_ui.h"
#endif
#if defined(HAVE_XINPUT2)
diff --git a/chrome/browser/ui/cocoa/constrained_html_delegate_mac.mm b/chrome/browser/ui/cocoa/constrained_html_delegate_mac.mm
index 52efd8e..61b9a75b 100644
--- a/chrome/browser/ui/cocoa/constrained_html_delegate_mac.mm
+++ b/chrome/browser/ui/cocoa/constrained_html_delegate_mac.mm
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/webui/constrained_html_ui.h"
+#include "chrome/browser/ui/webui/constrained_html_ui.h"
#include "base/scoped_nsobject.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/ui/cocoa/constrained_window_mac.h"
-#include "chrome/browser/webui/html_dialog_ui.h"
+#include "chrome/browser/ui/webui/html_dialog_ui.h"
#include "chrome/browser/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.h b/chrome/browser/ui/cocoa/html_dialog_window_controller.h
index 89c3bf4..e5660da1 100644
--- a/chrome/browser/ui/cocoa/html_dialog_window_controller.h
+++ b/chrome/browser/ui/cocoa/html_dialog_window_controller.h
@@ -10,7 +10,7 @@
#include "base/basictypes.h"
#include "base/scoped_ptr.h"
-#include "chrome/browser/webui/html_dialog_ui.h"
+#include "chrome/browser/ui/webui/html_dialog_ui.h"
class HtmlDialogWindowDelegateBridge;
class Profile;
diff --git a/chrome/browser/ui/cocoa/html_dialog_window_controller.mm b/chrome/browser/ui/cocoa/html_dialog_window_controller.mm
index d9fd127..68d25df 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_ui.h"
#include "chrome/browser/webui/html_dialog_tab_contents_delegate.h"
-#include "chrome/browser/webui/html_dialog_ui.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/cocoa/html_dialog_window_controller_unittest.mm b/chrome/browser/ui/cocoa/html_dialog_window_controller_unittest.mm
index a8c9927..b8e2c66 100644
--- a/chrome/browser/ui/cocoa/html_dialog_window_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/html_dialog_window_controller_unittest.mm
@@ -13,7 +13,7 @@
#include "base/sys_string_conversions.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
-#include "chrome/browser/webui/html_dialog_ui.h"
+#include "chrome/browser/ui/webui/html_dialog_ui.h"
#include "chrome/test/browser_with_test_window_test.h"
#include "chrome/test/testing_profile.h"
#include "content/browser/webui/web_ui.h"
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index b31becfc..e6b6eb4 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -73,8 +73,8 @@
#include "chrome/browser/ui/gtk/update_recommended_dialog.h"
#include "chrome/browser/ui/omnibox/location_bar.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/webui/bug_report_ui.h"
#include "chrome/browser/ui/window_sizer.h"
-#include "chrome/browser/webui/bug_report_ui.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/native_web_keyboard_event.h"
#include "chrome/common/notification_service.h"
diff --git a/chrome/browser/ui/gtk/constrained_html_delegate_gtk.cc b/chrome/browser/ui/gtk/constrained_html_delegate_gtk.cc
index 670d4cb..689125f 100644
--- a/chrome/browser/ui/gtk/constrained_html_delegate_gtk.cc
+++ b/chrome/browser/ui/gtk/constrained_html_delegate_gtk.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/webui/constrained_html_ui.h"
+#include "chrome/browser/ui/webui/constrained_html_ui.h"
#include "chrome/browser/renderer_host/render_view_host.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#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_ui.h"
#include "chrome/browser/webui/html_dialog_tab_contents_delegate.h"
-#include "chrome/browser/webui/html_dialog_ui.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.cc b/chrome/browser/ui/gtk/html_dialog_gtk.cc
index 72ed2a1a..e064b09 100644
--- a/chrome/browser/ui/gtk/html_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/html_dialog_gtk.cc
@@ -13,7 +13,7 @@
#include "chrome/browser/ui/browser_dialogs.h"
#include "chrome/browser/ui/gtk/gtk_util.h"
#include "chrome/browser/ui/gtk/tab_contents_container_gtk.h"
-#include "chrome/browser/webui/html_dialog_ui.h"
+#include "chrome/browser/ui/webui/html_dialog_ui.h"
#include "chrome/common/native_web_keyboard_event.h"
#include "ipc/ipc_message.h"
diff --git a/chrome/browser/ui/gtk/html_dialog_gtk.h b/chrome/browser/ui/gtk/html_dialog_gtk.h
index 25f0fdb63..11cbcca 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_ui.h"
#include "chrome/browser/webui/html_dialog_tab_contents_delegate.h"
-#include "chrome/browser/webui/html_dialog_ui.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 7b48fc4..df9ba4f 100644
--- a/chrome/browser/ui/views/constrained_html_delegate_gtk.cc
+++ b/chrome/browser/ui/views/constrained_html_delegate_gtk.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/webui/constrained_html_ui.h"
+#include "chrome/browser/ui/webui/constrained_html_ui.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#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_ui.h"
#include "chrome/browser/webui/html_dialog_tab_contents_delegate.h"
-#include "chrome/browser/webui/html_dialog_ui.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 744c4e0..b8d51c0 100644
--- a/chrome/browser/ui/views/constrained_html_delegate_win.cc
+++ b/chrome/browser/ui/views/constrained_html_delegate_win.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/webui/constrained_html_ui.h"
+#include "chrome/browser/ui/webui/constrained_html_ui.h"
#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_ui.h"
#include "chrome/browser/webui/html_dialog_tab_contents_delegate.h"
-#include "chrome/browser/webui/html_dialog_ui.h"
#include "ipc/ipc_message.h"
#include "ui/gfx/rect.h"
#include "views/view.h"
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 7b3bdc3..e4e92a1 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -59,8 +59,8 @@
#include "chrome/browser/ui/views/toolbar_view.h"
#include "chrome/browser/ui/views/update_recommended_message_box.h"
#include "chrome/browser/ui/views/window.h"
+#include "chrome/browser/ui/webui/bug_report_ui.h"
#include "chrome/browser/ui/window_sizer.h"
-#include "chrome/browser/webui/bug_report_ui.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/extensions/extension_resource.h"
#include "chrome/common/native_window_notification_source.h"
diff --git a/chrome/browser/ui/views/html_dialog_view.h b/chrome/browser/ui/views/html_dialog_view.h
index 1a2d5cb..9329c1e 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_ui.h"
#include "chrome/browser/webui/html_dialog_tab_contents_delegate.h"
-#include "chrome/browser/webui/html_dialog_ui.h"
#include "ui/gfx/size.h"
#include "views/window/window_delegate.h"
diff --git a/chrome/browser/ui/views/html_dialog_view_browsertest.cc b/chrome/browser/ui/views/html_dialog_view_browsertest.cc
index d5f78d0..7862c85 100644
--- a/chrome/browser/ui/views/html_dialog_view_browsertest.cc
+++ b/chrome/browser/ui/views/html_dialog_view_browsertest.cc
@@ -10,7 +10,7 @@
#include "chrome/browser/renderer_host/render_widget_host_view.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/ui/views/html_dialog_view.h"
-#include "chrome/browser/webui/html_dialog_ui.h"
+#include "chrome/browser/ui/webui/html_dialog_ui.h"
#include "chrome/common/url_constants.h"
#include "chrome/test/in_process_browser_test.h"
#include "chrome/test/ui_test_utils.h"
diff --git a/chrome/browser/ui/views/keyboard_overlay_delegate.cc b/chrome/browser/ui/views/keyboard_overlay_delegate.cc
index 2b2fef3..2591b681 100644
--- a/chrome/browser/ui/views/keyboard_overlay_delegate.cc
+++ b/chrome/browser/ui/views/keyboard_overlay_delegate.cc
@@ -10,7 +10,7 @@
#include "chrome/browser/chromeos/frame/bubble_window.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/views/html_dialog_view.h"
-#include "chrome/browser/webui/html_dialog_ui.h"
+#include "chrome/browser/ui/webui/html_dialog_ui.h"
#include "chrome/common/url_constants.h"
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/ui/views/keyboard_overlay_delegate.h b/chrome/browser/ui/views/keyboard_overlay_delegate.h
index c85b17b..75ab7ea5 100644
--- a/chrome/browser/ui/views/keyboard_overlay_delegate.h
+++ b/chrome/browser/ui/views/keyboard_overlay_delegate.h
@@ -5,7 +5,7 @@
#ifndef CHROME_BROWSER_UI_VIEWS_KEYBOARD_OVERLAY_DELEGATE_H_
#define CHROME_BROWSER_UI_VIEWS_KEYBOARD_OVERLAY_DELEGATE_H_
-#include "chrome/browser/webui/html_dialog_ui.h"
+#include "chrome/browser/ui/webui/html_dialog_ui.h"
#include "ui/gfx/native_widget_types.h"
class KeyboardOverlayDelegate : public HtmlDialogUIDelegate {
diff --git a/chrome/browser/ui/views/options/general_page_view.cc b/chrome/browser/ui/views/options/general_page_view.cc
index ce3027b..0996b4a 100644
--- a/chrome/browser/ui/views/options/general_page_view.cc
+++ b/chrome/browser/ui/views/options/general_page_view.cc
@@ -28,7 +28,7 @@
#include "chrome/browser/ui/views/keyword_editor_view.h"
#include "chrome/browser/ui/views/options/managed_prefs_banner_view.h"
#include "chrome/browser/ui/views/options/options_group_view.h"
-#include "chrome/browser/webui/new_tab_ui.h"
+#include "chrome/browser/ui/webui/new_tab_ui.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
diff --git a/chrome/browser/ui/views/select_file_dialog.cc b/chrome/browser/ui/views/select_file_dialog.cc
index b4a08efc..4ea81b7 100644
--- a/chrome/browser/ui/views/select_file_dialog.cc
+++ b/chrome/browser/ui/views/select_file_dialog.cc
@@ -19,7 +19,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_dialogs.h"
#include "chrome/browser/ui/views/html_dialog_view.h"
-#include "chrome/browser/webui/html_dialog_ui.h"
+#include "chrome/browser/ui/webui/html_dialog_ui.h"
#include "chrome/common/url_constants.h"
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/ui/views/textfield_views.cc b/chrome/browser/ui/views/textfield_views.cc
index 8e1268f9..b4aabdb8 100644
--- a/chrome/browser/ui/views/textfield_views.cc
+++ b/chrome/browser/ui/views/textfield_views.cc
@@ -7,7 +7,7 @@
#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/webui/textfields_ui.h"
+#include "chrome/browser/ui/webui/textfields_ui.h"
TextfieldViews::TextfieldViews() : DOMView() {}
diff --git a/chrome/browser/webui/bookmarks_ui.cc b/chrome/browser/ui/webui/bookmarks_ui.cc
similarity index 97%
rename from chrome/browser/webui/bookmarks_ui.cc
rename to chrome/browser/ui/webui/bookmarks_ui.cc
index e5bc4a6..3cdd0f4 100644
--- a/chrome/browser/webui/bookmarks_ui.cc
+++ b/chrome/browser/ui/webui/bookmarks_ui.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/bookmarks_ui.h"
+#include "chrome/browser/ui/webui/bookmarks_ui.h"
#include "base/message_loop.h"
#include "base/ref_counted_memory.h"
diff --git a/chrome/browser/webui/bookmarks_ui.h b/chrome/browser/ui/webui/bookmarks_ui.h
similarity index 88%
rename from chrome/browser/webui/bookmarks_ui.h
rename to chrome/browser/ui/webui/bookmarks_ui.h
index c427d9a5..10c51133 100644
--- a/chrome/browser/webui/bookmarks_ui.h
+++ b/chrome/browser/ui/webui/bookmarks_ui.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_BOOKMARKS_UI_H_
-#define CHROME_BROWSER_WEBUI_BOOKMARKS_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_BOOKMARKS_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_BOOKMARKS_UI_H_
#pragma once
#include <string>
@@ -42,4 +42,4 @@
DISALLOW_COPY_AND_ASSIGN(BookmarksUI);
};
-#endif // CHROME_BROWSER_WEBUI_BOOKMARKS_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_BOOKMARKS_UI_H_
diff --git a/chrome/browser/webui/bookmarks_ui_uitest.cc b/chrome/browser/ui/webui/bookmarks_ui_uitest.cc
similarity index 100%
rename from chrome/browser/webui/bookmarks_ui_uitest.cc
rename to chrome/browser/ui/webui/bookmarks_ui_uitest.cc
diff --git a/chrome/browser/webui/bug_report_ui.cc b/chrome/browser/ui/webui/bug_report_ui.cc
similarity index 99%
rename from chrome/browser/webui/bug_report_ui.cc
rename to chrome/browser/ui/webui/bug_report_ui.cc
index 929f2b2e..1b99d6a 100644
--- a/chrome/browser/webui/bug_report_ui.cc
+++ b/chrome/browser/ui/webui/bug_report_ui.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/bug_report_ui.h"
+#include "chrome/browser/ui/webui/bug_report_ui.h"
#include <algorithm>
#include <string>
diff --git a/chrome/browser/webui/bug_report_ui.h b/chrome/browser/ui/webui/bug_report_ui.h
similarity index 73%
rename from chrome/browser/webui/bug_report_ui.h
rename to chrome/browser/ui/webui/bug_report_ui.h
index bf14544..e4814d5 100644
--- a/chrome/browser/webui/bug_report_ui.h
+++ b/chrome/browser/ui/webui/bug_report_ui.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_BUG_REPORT_UI_H_
-#define CHROME_BROWSER_WEBUI_BUG_REPORT_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_BUG_REPORT_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_BUG_REPORT_UI_H_
#include "chrome/browser/ui/views/window.h"
-#include "chrome/browser/webui/html_dialog_ui.h"
+#include "chrome/browser/ui/webui/html_dialog_ui.h"
namespace gfx {
class Rect;
@@ -28,4 +28,4 @@
DISALLOW_COPY_AND_ASSIGN(BugReportUI);
};
-#endif // CHROME_BROWSER_WEBUI_BUG_REPORT_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_BUG_REPORT_UI_H_
diff --git a/chrome/browser/webui/conflicts_ui.cc b/chrome/browser/ui/webui/conflicts_ui.cc
similarity index 99%
rename from chrome/browser/webui/conflicts_ui.cc
rename to chrome/browser/ui/webui/conflicts_ui.cc
index 73afb4de..5ff5a65 100644
--- a/chrome/browser/webui/conflicts_ui.cc
+++ b/chrome/browser/ui/webui/conflicts_ui.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/conflicts_ui.h"
+#include "chrome/browser/ui/webui/conflicts_ui.h"
#if defined(OS_WIN)
diff --git a/chrome/browser/webui/conflicts_ui.h b/chrome/browser/ui/webui/conflicts_ui.h
similarity index 78%
rename from chrome/browser/webui/conflicts_ui.h
rename to chrome/browser/ui/webui/conflicts_ui.h
index 929b3817..3e05ccf 100644
--- a/chrome/browser/webui/conflicts_ui.h
+++ b/chrome/browser/ui/webui/conflicts_ui.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_CONFLICTS_UI_H_
-#define CHROME_BROWSER_WEBUI_CONFLICTS_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_CONFLICTS_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_CONFLICTS_UI_H_
#pragma once
#include "content/browser/webui/web_ui.h"
@@ -25,4 +25,4 @@
#endif
-#endif // CHROME_BROWSER_WEBUI_CONFLICTS_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_CONFLICTS_UI_H_
diff --git a/chrome/browser/webui/constrained_html_ui.cc b/chrome/browser/ui/webui/constrained_html_ui.cc
similarity index 95%
rename from chrome/browser/webui/constrained_html_ui.cc
rename to chrome/browser/ui/webui/constrained_html_ui.cc
index 7036cc0ee..68dd0249 100644
--- a/chrome/browser/webui/constrained_html_ui.cc
+++ b/chrome/browser/ui/webui/constrained_html_ui.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/webui/constrained_html_ui.h"
+#include "chrome/browser/ui/webui/constrained_html_ui.h"
#include "base/lazy_instance.h"
#include "chrome/browser/renderer_host/render_view_host.h"
#include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/webui/html_dialog_ui.h"
+#include "chrome/browser/ui/webui/html_dialog_ui.h"
#include "chrome/common/bindings_policy.h"
#include "content/browser/webui/web_ui_util.h"
diff --git a/chrome/browser/webui/constrained_html_ui.h b/chrome/browser/ui/webui/constrained_html_ui.h
similarity index 92%
rename from chrome/browser/webui/constrained_html_ui.h
rename to chrome/browser/ui/webui/constrained_html_ui.h
index 6ab78ecd..55da2db5 100644
--- a/chrome/browser/webui/constrained_html_ui.h
+++ b/chrome/browser/ui/webui/constrained_html_ui.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_CONSTRAINED_HTML_UI_H_
-#define CHROME_BROWSER_WEBUI_CONSTRAINED_HTML_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_CONSTRAINED_HTML_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_CONSTRAINED_HTML_UI_H_
#pragma once
#include <vector>
@@ -61,4 +61,4 @@
DISALLOW_COPY_AND_ASSIGN(ConstrainedHtmlUI);
};
-#endif // CHROME_BROWSER_WEBUI_CONSTRAINED_HTML_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_CONSTRAINED_HTML_UI_H_
diff --git a/chrome/browser/webui/constrained_html_ui_browsertest.cc b/chrome/browser/ui/webui/constrained_html_ui_browsertest.cc
similarity index 95%
rename from chrome/browser/webui/constrained_html_ui_browsertest.cc
rename to chrome/browser/ui/webui/constrained_html_ui_browsertest.cc
index 6be6693b..5b40613 100644
--- a/chrome/browser/webui/constrained_html_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/constrained_html_ui_browsertest.cc
@@ -8,8 +8,8 @@
#include "base/message_loop.h"
#include "chrome/browser/renderer_host/render_widget_host_view.h"
#include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/webui/constrained_html_ui.h"
-#include "chrome/browser/webui/html_dialog_ui.h"
+#include "chrome/browser/ui/webui/constrained_html_ui.h"
+#include "chrome/browser/ui/webui/html_dialog_ui.h"
#include "chrome/common/url_constants.h"
#include "chrome/test/in_process_browser_test.h"
#include "chrome/test/ui_test_utils.h"
diff --git a/chrome/browser/webui/crashes_ui.cc b/chrome/browser/ui/webui/crashes_ui.cc
similarity index 99%
rename from chrome/browser/webui/crashes_ui.cc
rename to chrome/browser/ui/webui/crashes_ui.cc
index d8747d6c..d4bb4352a 100644
--- a/chrome/browser/webui/crashes_ui.cc
+++ b/chrome/browser/ui/webui/crashes_ui.cc
@@ -2,17 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/webui/crashes_ui.h"
+#include "chrome/browser/ui/webui/crashes_ui.h"
#include "base/i18n/time_formatting.h"
#include "base/ref_counted_memory.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/browser/crash_upload_list.h"
-#include "chrome/browser/webui/chrome_url_data_manager.h"
#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/common/jstemplate_builder.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
diff --git a/chrome/browser/webui/crashes_ui.h b/chrome/browser/ui/webui/crashes_ui.h
similarity index 76%
rename from chrome/browser/webui/crashes_ui.h
rename to chrome/browser/ui/webui/crashes_ui.h
index db9f0ed..919b260 100644
--- a/chrome/browser/webui/crashes_ui.h
+++ b/chrome/browser/ui/webui/crashes_ui.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_CRASHES_UI_H_
-#define CHROME_BROWSER_WEBUI_CRASHES_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_CRASHES_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_CRASHES_UI_H_
#pragma once
#include "content/browser/webui/web_ui.h"
@@ -20,4 +20,4 @@
DISALLOW_COPY_AND_ASSIGN(CrashesUI);
};
-#endif // CHROME_BROWSER_WEBUI_CRASHES_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_CRASHES_UI_H_
diff --git a/chrome/browser/webui/devtools_ui.cc b/chrome/browser/ui/webui/devtools_ui.cc
similarity index 91%
rename from chrome/browser/webui/devtools_ui.cc
rename to chrome/browser/ui/webui/devtools_ui.cc
index 6e767a0b..50aa4f3 100644
--- a/chrome/browser/webui/devtools_ui.cc
+++ b/chrome/browser/ui/webui/devtools_ui.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/devtools_ui.h"
+#include "chrome/browser/ui/webui/devtools_ui.h"
#include "chrome/browser/renderer_host/render_view_host.h"
#include "chrome/common/render_messages.h"
diff --git a/chrome/browser/webui/devtools_ui.h b/chrome/browser/ui/webui/devtools_ui.h
similarity index 75%
rename from chrome/browser/webui/devtools_ui.h
rename to chrome/browser/ui/webui/devtools_ui.h
index ea801e67..cca4e51 100644
--- a/chrome/browser/webui/devtools_ui.h
+++ b/chrome/browser/ui/webui/devtools_ui.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_DEVTOOLS_UI_H_
-#define CHROME_BROWSER_WEBUI_DEVTOOLS_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_DEVTOOLS_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_DEVTOOLS_UI_H_
#pragma once
#include "content/browser/webui/web_ui.h"
@@ -19,4 +19,4 @@
DISALLOW_COPY_AND_ASSIGN(DevToolsUI);
};
-#endif // CHROME_BROWSER_WEBUI_DEVTOOLS_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_DEVTOOLS_UI_H_
diff --git a/chrome/browser/webui/downloads_ui.cc b/chrome/browser/ui/webui/downloads_ui.cc
similarity index 98%
rename from chrome/browser/webui/downloads_ui.cc
rename to chrome/browser/ui/webui/downloads_ui.cc
index b9dc34de..96f7466 100644
--- a/chrome/browser/webui/downloads_ui.cc
+++ b/chrome/browser/ui/webui/downloads_ui.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_ui.h"
+#include "chrome/browser/ui/webui/downloads_ui.h"
#include "base/singleton.h"
#include "base/string_piece.h"
diff --git a/chrome/browser/webui/downloads_ui.h b/chrome/browser/ui/webui/downloads_ui.h
similarity index 75%
rename from chrome/browser/webui/downloads_ui.h
rename to chrome/browser/ui/webui/downloads_ui.h
index 9f5ae06..41c1832 100644
--- a/chrome/browser/webui/downloads_ui.h
+++ b/chrome/browser/ui/webui/downloads_ui.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_UI_H_
-#define CHROME_BROWSER_WEBUI_DOWNLOADS_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_DOWNLOADS_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_DOWNLOADS_UI_H_
#pragma once
#include "content/browser/webui/web_ui.h"
@@ -20,4 +20,4 @@
DISALLOW_COPY_AND_ASSIGN(DownloadsUI);
};
-#endif // CHROME_BROWSER_WEBUI_DOWNLOADS_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_DOWNLOADS_UI_H_
diff --git a/chrome/browser/webui/filebrowse_ui.cc b/chrome/browser/ui/webui/filebrowse_ui.cc
similarity index 99%
rename from chrome/browser/webui/filebrowse_ui.cc
rename to chrome/browser/ui/webui/filebrowse_ui.cc
index b5a00b6..6d6c1cb8 100644
--- a/chrome/browser/webui/filebrowse_ui.cc
+++ b/chrome/browser/ui/webui/filebrowse_ui.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/filebrowse_ui.h"
+#include "chrome/browser/ui/webui/filebrowse_ui.h"
#include <algorithm>
#include <vector>
@@ -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/mediaplayer_ui.h"
#include "chrome/browser/webui/favicon_source.h"
-#include "chrome/browser/webui/mediaplayer_ui.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/jstemplate_builder.h"
diff --git a/chrome/browser/webui/filebrowse_ui.h b/chrome/browser/ui/webui/filebrowse_ui.h
similarity index 82%
rename from chrome/browser/webui/filebrowse_ui.h
rename to chrome/browser/ui/webui/filebrowse_ui.h
index bfffa5a..1df17d4 100644
--- a/chrome/browser/webui/filebrowse_ui.h
+++ b/chrome/browser/ui/webui/filebrowse_ui.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_WEBUI_FILEBROWSE_UI_H_
-#define CHROME_BROWSER_WEBUI_FILEBROWSE_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_FILEBROWSE_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_FILEBROWSE_UI_H_
#pragma once
#include <string>
#include "chrome/browser/history/history.h"
+#include "chrome/browser/ui/webui/html_dialog_ui.h"
#include "chrome/browser/webui/chrome_url_data_manager.h"
-#include "chrome/browser/webui/html_dialog_ui.h"
#include "net/base/directory_lister.h"
class Browser;
@@ -36,4 +36,4 @@
DISALLOW_COPY_AND_ASSIGN(FileBrowseUI);
};
-#endif // CHROME_BROWSER_WEBUI_FILEBROWSE_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_FILEBROWSE_UI_H_
diff --git a/chrome/browser/webui/flags_ui.cc b/chrome/browser/ui/webui/flags_ui.cc
similarity index 99%
rename from chrome/browser/webui/flags_ui.cc
rename to chrome/browser/ui/webui/flags_ui.cc
index ae83a92..8724388 100644
--- a/chrome/browser/webui/flags_ui.cc
+++ b/chrome/browser/ui/webui/flags_ui.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/flags_ui.h"
+#include "chrome/browser/ui/webui/flags_ui.h"
#include <string>
diff --git a/chrome/browser/webui/flags_ui.h b/chrome/browser/ui/webui/flags_ui.h
similarity index 78%
rename from chrome/browser/webui/flags_ui.h
rename to chrome/browser/ui/webui/flags_ui.h
index 930fe2d..97c5fec6 100644
--- a/chrome/browser/webui/flags_ui.h
+++ b/chrome/browser/ui/webui/flags_ui.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_FLAGS_UI_H_
-#define CHROME_BROWSER_WEBUI_FLAGS_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_FLAGS_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_FLAGS_UI_H_
#pragma once
#include "content/browser/webui/web_ui.h"
@@ -22,4 +22,4 @@
DISALLOW_COPY_AND_ASSIGN(FlagsUI);
};
-#endif // CHROME_BROWSER_WEBUI_FLAGS_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_FLAGS_UI_H_
diff --git a/chrome/browser/webui/gpu_internals_ui.cc b/chrome/browser/ui/webui/gpu_internals_ui.cc
similarity index 99%
rename from chrome/browser/webui/gpu_internals_ui.cc
rename to chrome/browser/ui/webui/gpu_internals_ui.cc
index 7a2f2bd..69cc2b76 100644
--- a/chrome/browser/webui/gpu_internals_ui.cc
+++ b/chrome/browser/ui/webui/gpu_internals_ui.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/gpu_internals_ui.h"
+#include "chrome/browser/ui/webui/gpu_internals_ui.h"
#include <algorithm>
#include <string>
diff --git a/chrome/browser/webui/gpu_internals_ui.h b/chrome/browser/ui/webui/gpu_internals_ui.h
similarity index 70%
rename from chrome/browser/webui/gpu_internals_ui.h
rename to chrome/browser/ui/webui/gpu_internals_ui.h
index 84c4af9..5e7d841d 100644
--- a/chrome/browser/webui/gpu_internals_ui.h
+++ b/chrome/browser/ui/webui/gpu_internals_ui.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_GPU_INTERNALS_UI_H_
-#define CHROME_BROWSER_WEBUI_GPU_INTERNALS_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_GPU_INTERNALS_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_GPU_INTERNALS_UI_H_
#pragma once
#include "content/browser/webui/web_ui.h"
@@ -16,5 +16,5 @@
DISALLOW_COPY_AND_ASSIGN(GpuInternalsUI);
};
-#endif // CHROME_BROWSER_WEBUI_GPU_INTERNALS_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_GPU_INTERNALS_UI_H_
diff --git a/chrome/browser/webui/history2_ui.cc b/chrome/browser/ui/webui/history2_ui.cc
similarity index 99%
rename from chrome/browser/webui/history2_ui.cc
rename to chrome/browser/ui/webui/history2_ui.cc
index 2d4d22e..fcdce94b 100644
--- a/chrome/browser/webui/history2_ui.cc
+++ b/chrome/browser/ui/webui/history2_ui.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/history2_ui.h"
+#include "chrome/browser/ui/webui/history2_ui.h"
#include <algorithm>
#include <set>
diff --git a/chrome/browser/webui/history2_ui.h b/chrome/browser/ui/webui/history2_ui.h
similarity index 95%
rename from chrome/browser/webui/history2_ui.h
rename to chrome/browser/ui/webui/history2_ui.h
index bfc84722..cf99253 100644
--- a/chrome/browser/webui/history2_ui.h
+++ b/chrome/browser/ui/webui/history2_ui.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_HISTORY2_UI_H_
-#define CHROME_BROWSER_WEBUI_HISTORY2_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_HISTORY2_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_HISTORY2_UI_H_
#pragma once
#include <string>
@@ -109,4 +109,4 @@
DISALLOW_COPY_AND_ASSIGN(HistoryUI2);
};
-#endif // CHROME_BROWSER_WEBUI_HISTORY2_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_HISTORY2_UI_H_
diff --git a/chrome/browser/webui/history_ui.cc b/chrome/browser/ui/webui/history_ui.cc
similarity index 99%
rename from chrome/browser/webui/history_ui.cc
rename to chrome/browser/ui/webui/history_ui.cc
index 2ca1d99b1..5cc50da8 100644
--- a/chrome/browser/webui/history_ui.cc
+++ b/chrome/browser/ui/webui/history_ui.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/history_ui.h"
+#include "chrome/browser/ui/webui/history_ui.h"
#include <algorithm>
#include <set>
diff --git a/chrome/browser/webui/history_ui.h b/chrome/browser/ui/webui/history_ui.h
similarity index 95%
rename from chrome/browser/webui/history_ui.h
rename to chrome/browser/ui/webui/history_ui.h
index 8815566..0513fbe 100644
--- a/chrome/browser/webui/history_ui.h
+++ b/chrome/browser/ui/webui/history_ui.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_HISTORY_UI_H_
-#define CHROME_BROWSER_WEBUI_HISTORY_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_HISTORY_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_HISTORY_UI_H_
#pragma once
#include <string>
@@ -105,4 +105,4 @@
DISALLOW_COPY_AND_ASSIGN(HistoryUI);
};
-#endif // CHROME_BROWSER_WEBUI_HISTORY_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_HISTORY_UI_H_
diff --git a/chrome/browser/webui/html_dialog_ui.cc b/chrome/browser/ui/webui/html_dialog_ui.cc
similarity index 98%
rename from chrome/browser/webui/html_dialog_ui.cc
rename to chrome/browser/ui/webui/html_dialog_ui.cc
index f1958a2..ff07d7f 100644
--- a/chrome/browser/webui/html_dialog_ui.cc
+++ b/chrome/browser/ui/webui/html_dialog_ui.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_ui.h"
+#include "chrome/browser/ui/webui/html_dialog_ui.h"
#include "base/callback.h"
#include "base/lazy_instance.h"
diff --git a/chrome/browser/webui/html_dialog_ui.h b/chrome/browser/ui/webui/html_dialog_ui.h
similarity index 96%
rename from chrome/browser/webui/html_dialog_ui.h
rename to chrome/browser/ui/webui/html_dialog_ui.h
index ce3163e..6ffa4f6 100644
--- a/chrome/browser/webui/html_dialog_ui.h
+++ b/chrome/browser/ui/webui/html_dialog_ui.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_UI_H_
-#define CHROME_BROWSER_WEBUI_HTML_DIALOG_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_HTML_DIALOG_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_HTML_DIALOG_UI_H_
#pragma once
#include <string>
@@ -117,4 +117,4 @@
virtual ~ExternalHtmlDialogUI();
};
-#endif // CHROME_BROWSER_WEBUI_HTML_DIALOG_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_HTML_DIALOG_UI_H_
diff --git a/chrome/browser/webui/keyboard_ui.cc b/chrome/browser/ui/webui/keyboard_ui.cc
similarity index 96%
rename from chrome/browser/webui/keyboard_ui.cc
rename to chrome/browser/ui/webui/keyboard_ui.cc
index e11964ca..af7445c 100644
--- a/chrome/browser/webui/keyboard_ui.cc
+++ b/chrome/browser/ui/webui/keyboard_ui.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/keyboard_ui.h"
+#include "chrome/browser/ui/webui/keyboard_ui.h"
#include "base/ref_counted_memory.h"
#include "base/singleton.h"
diff --git a/chrome/browser/webui/keyboard_ui.h b/chrome/browser/ui/webui/keyboard_ui.h
similarity index 87%
rename from chrome/browser/webui/keyboard_ui.h
rename to chrome/browser/ui/webui/keyboard_ui.h
index 039d0cb..980e28bf 100644
--- a/chrome/browser/webui/keyboard_ui.h
+++ b/chrome/browser/ui/webui/keyboard_ui.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_KEYBOARD_UI_H_
-#define CHROME_BROWSER_WEBUI_KEYBOARD_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_KEYBOARD_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_KEYBOARD_UI_H_
#pragma once
#include <string>
@@ -39,4 +39,4 @@
DISALLOW_COPY_AND_ASSIGN(KeyboardUI);
};
-#endif // CHROME_BROWSER_WEBUI_KEYBOARD_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_KEYBOARD_UI_H_
diff --git a/chrome/browser/webui/mediaplayer_ui.cc b/chrome/browser/ui/webui/mediaplayer_ui.cc
similarity index 99%
rename from chrome/browser/webui/mediaplayer_ui.cc
rename to chrome/browser/ui/webui/mediaplayer_ui.cc
index a90723b..d43930f2 100644
--- a/chrome/browser/webui/mediaplayer_ui.cc
+++ b/chrome/browser/ui/webui/mediaplayer_ui.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/mediaplayer_ui.h"
+#include "chrome/browser/ui/webui/mediaplayer_ui.h"
#include "base/command_line.h"
#include "base/logging.h"
diff --git a/chrome/browser/webui/mediaplayer_ui.h b/chrome/browser/ui/webui/mediaplayer_ui.h
similarity index 97%
rename from chrome/browser/webui/mediaplayer_ui.h
rename to chrome/browser/ui/webui/mediaplayer_ui.h
index 94dd120..5b5afcf 100644
--- a/chrome/browser/webui/mediaplayer_ui.h
+++ b/chrome/browser/ui/webui/mediaplayer_ui.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_MEDIAPLAYER_UI_H_
-#define CHROME_BROWSER_WEBUI_MEDIAPLAYER_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_MEDIAPLAYER_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_MEDIAPLAYER_UI_H_
#pragma once
#include <set>
@@ -158,4 +158,4 @@
DISALLOW_COPY_AND_ASSIGN(MediaplayerUI);
};
-#endif // CHROME_BROWSER_WEBUI_MEDIAPLAYER_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_MEDIAPLAYER_UI_H_
diff --git a/chrome/browser/webui/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals_ui.cc
similarity index 99%
rename from chrome/browser/webui/net_internals_ui.cc
rename to chrome/browser/ui/webui/net_internals_ui.cc
index 0aaddd1..4791c319 100644
--- a/chrome/browser/webui/net_internals_ui.cc
+++ b/chrome/browser/ui/webui/net_internals_ui.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/net_internals_ui.h"
+#include "chrome/browser/ui/webui/net_internals_ui.h"
#include <algorithm>
#include <string>
diff --git a/chrome/browser/webui/net_internals_ui.h b/chrome/browser/ui/webui/net_internals_ui.h
similarity index 70%
rename from chrome/browser/webui/net_internals_ui.h
rename to chrome/browser/ui/webui/net_internals_ui.h
index a5edf553..023d76a 100644
--- a/chrome/browser/webui/net_internals_ui.h
+++ b/chrome/browser/ui/webui/net_internals_ui.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_NET_INTERNALS_UI_H_
-#define CHROME_BROWSER_WEBUI_NET_INTERNALS_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_NET_INTERNALS_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_NET_INTERNALS_UI_H_
#pragma once
#include "content/browser/webui/web_ui.h"
@@ -16,4 +16,4 @@
DISALLOW_COPY_AND_ASSIGN(NetInternalsUI);
};
-#endif // CHROME_BROWSER_WEBUI_NET_INTERNALS_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_NET_INTERNALS_UI_H_
diff --git a/chrome/browser/webui/new_tab_ui.cc b/chrome/browser/ui/webui/new_tab_ui.cc
similarity index 99%
rename from chrome/browser/webui/new_tab_ui.cc
rename to chrome/browser/ui/webui/new_tab_ui.cc
index d6a3561..a2e28b7 100644
--- a/chrome/browser/webui/new_tab_ui.cc
+++ b/chrome/browser/ui/webui/new_tab_ui.cc
@@ -4,7 +4,7 @@
#include "build/build_config.h"
-#include "chrome/browser/webui/new_tab_ui.h"
+#include "chrome/browser/ui/webui/new_tab_ui.h"
#include <set>
diff --git a/chrome/browser/webui/new_tab_ui.h b/chrome/browser/ui/webui/new_tab_ui.h
similarity index 96%
rename from chrome/browser/webui/new_tab_ui.h
rename to chrome/browser/ui/webui/new_tab_ui.h
index 3d152dc3..005482c 100644
--- a/chrome/browser/webui/new_tab_ui.h
+++ b/chrome/browser/ui/webui/new_tab_ui.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_UI_H_
-#define CHROME_BROWSER_WEBUI_NEW_TAB_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_NEW_TAB_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_NEW_TAB_UI_H_
#pragma once
#include <string>
@@ -120,4 +120,4 @@
DISALLOW_COPY_AND_ASSIGN(NewTabUI);
};
-#endif // CHROME_BROWSER_WEBUI_NEW_TAB_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_NEW_TAB_UI_H_
diff --git a/chrome/browser/webui/new_tab_ui_uitest.cc b/chrome/browser/ui/webui/new_tab_ui_uitest.cc
similarity index 98%
rename from chrome/browser/webui/new_tab_ui_uitest.cc
rename to chrome/browser/ui/webui/new_tab_ui_uitest.cc
index 527c06c..3164fb696 100644
--- a/chrome/browser/webui/new_tab_ui_uitest.cc
+++ b/chrome/browser/ui/webui/new_tab_ui_uitest.cc
@@ -8,7 +8,7 @@
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/prefs/pref_value_store.h"
#include "chrome/browser/sync/signin_manager.h"
-#include "chrome/browser/webui/new_tab_ui.h"
+#include "chrome/browser/ui/webui/new_tab_ui.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/json_pref_store.h"
#include "chrome/common/pref_names.h"
diff --git a/chrome/browser/webui/plugins_ui.cc b/chrome/browser/ui/webui/plugins_ui.cc
similarity index 99%
rename from chrome/browser/webui/plugins_ui.cc
rename to chrome/browser/ui/webui/plugins_ui.cc
index a799170..fed678c 100644
--- a/chrome/browser/webui/plugins_ui.cc
+++ b/chrome/browser/ui/webui/plugins_ui.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/plugins_ui.h"
+#include "chrome/browser/ui/webui/plugins_ui.h"
#include <algorithm>
#include <string>
diff --git a/chrome/browser/webui/plugins_ui.h b/chrome/browser/ui/webui/plugins_ui.h
similarity index 78%
rename from chrome/browser/webui/plugins_ui.h
rename to chrome/browser/ui/webui/plugins_ui.h
index edfdc66..752e639 100644
--- a/chrome/browser/webui/plugins_ui.h
+++ b/chrome/browser/ui/webui/plugins_ui.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_PLUGINS_UI_H_
-#define CHROME_BROWSER_WEBUI_PLUGINS_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_PLUGINS_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_PLUGINS_UI_H_
#pragma once
#include "content/browser/webui/web_ui.h"
@@ -22,4 +22,4 @@
DISALLOW_COPY_AND_ASSIGN(PluginsUI);
};
-#endif // CHROME_BROWSER_WEBUI_PLUGINS_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_PLUGINS_UI_H_
diff --git a/chrome/browser/webui/print_preview_ui.cc b/chrome/browser/ui/webui/print_preview_ui.cc
similarity index 90%
rename from chrome/browser/webui/print_preview_ui.cc
rename to chrome/browser/ui/webui/print_preview_ui.cc
index 18a52c50..8cb2212 100644
--- a/chrome/browser/webui/print_preview_ui.cc
+++ b/chrome/browser/ui/webui/print_preview_ui.cc
@@ -2,14 +2,14 @@
// 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_ui.h"
+#include "chrome/browser/ui/webui/print_preview_ui.h"
#include "base/values.h"
#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_ui_html_source.h"
#include "chrome/browser/webui/print_preview_handler.h"
-#include "chrome/browser/webui/print_preview_ui_html_source.h"
PrintPreviewUI::PrintPreviewUI(TabContents* contents)
: WebUI(contents),
diff --git a/chrome/browser/webui/print_preview_ui.h b/chrome/browser/ui/webui/print_preview_ui.h
similarity index 82%
rename from chrome/browser/webui/print_preview_ui.h
rename to chrome/browser/ui/webui/print_preview_ui.h
index 55cd2b3..b4a62cf 100644
--- a/chrome/browser/webui/print_preview_ui.h
+++ b/chrome/browser/ui/webui/print_preview_ui.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_UI_H_
-#define CHROME_BROWSER_WEBUI_PRINT_PREVIEW_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_UI_H_
#pragma once
#include "base/ref_counted.h"
@@ -28,4 +28,4 @@
DISALLOW_COPY_AND_ASSIGN(PrintPreviewUI);
};
-#endif // CHROME_BROWSER_WEBUI_PRINT_PREVIEW_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_UI_H_
diff --git a/chrome/browser/webui/print_preview_ui_html_source.cc b/chrome/browser/ui/webui/print_preview_ui_html_source.cc
similarity index 98%
rename from chrome/browser/webui/print_preview_ui_html_source.cc
rename to chrome/browser/ui/webui/print_preview_ui_html_source.cc
index 3ac0f3706..9e37c648 100644
--- a/chrome/browser/webui/print_preview_ui_html_source.cc
+++ b/chrome/browser/ui/webui/print_preview_ui_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/print_preview_ui_html_source.h"
+#include "chrome/browser/ui/webui/print_preview_ui_html_source.h"
#include <algorithm>
#include <vector>
diff --git a/chrome/browser/webui/print_preview_ui_html_source.h b/chrome/browser/ui/webui/print_preview_ui_html_source.h
similarity index 88%
rename from chrome/browser/webui/print_preview_ui_html_source.h
rename to chrome/browser/ui/webui/print_preview_ui_html_source.h
index ca33cb16..2f9f8b8 100644
--- a/chrome/browser/webui/print_preview_ui_html_source.h
+++ b/chrome/browser/ui/webui/print_preview_ui_html_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_PRINT_PREVIEW_UI_HTML_SOURCE_H_
-#define CHROME_BROWSER_WEBUI_PRINT_PREVIEW_UI_HTML_SOURCE_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_UI_HTML_SOURCE_H_
+#define CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_UI_HTML_SOURCE_H_
#pragma once
#include <string>
@@ -48,4 +48,4 @@
DISALLOW_COPY_AND_ASSIGN(PrintPreviewUIHTMLSource);
};
-#endif // CHROME_BROWSER_WEBUI_PRINT_PREVIEW_UI_HTML_SOURCE_H_
+#endif // CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_UI_HTML_SOURCE_H_
diff --git a/chrome/browser/webui/print_preview_ui_html_source_unittest.cc b/chrome/browser/ui/webui/print_preview_ui_html_source_unittest.cc
similarity index 94%
rename from chrome/browser/webui/print_preview_ui_html_source_unittest.cc
rename to chrome/browser/ui/webui/print_preview_ui_html_source_unittest.cc
index a489c1c..eb0d123 100644
--- a/chrome/browser/webui/print_preview_ui_html_source_unittest.cc
+++ b/chrome/browser/ui/webui/print_preview_ui_html_source_unittest.cc
@@ -7,8 +7,8 @@
#include "chrome/browser/printing/print_preview_tab_controller.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/webui/print_preview_ui.h"
-#include "chrome/browser/webui/print_preview_ui_html_source.h"
+#include "chrome/browser/ui/webui/print_preview_ui.h"
+#include "chrome/browser/ui/webui/print_preview_ui_html_source.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/test/browser_with_test_window_test.h"
#include "chrome/test/testing_profile.h"
diff --git a/chrome/browser/webui/print_preview_ui_uitest.cc b/chrome/browser/ui/webui/print_preview_ui_uitest.cc
similarity index 100%
rename from chrome/browser/webui/print_preview_ui_uitest.cc
rename to chrome/browser/ui/webui/print_preview_ui_uitest.cc
diff --git a/chrome/browser/webui/remoting_ui.cc b/chrome/browser/ui/webui/remoting_ui.cc
similarity index 97%
rename from chrome/browser/webui/remoting_ui.cc
rename to chrome/browser/ui/webui/remoting_ui.cc
index f9e3e1f..654894a 100644
--- a/chrome/browser/webui/remoting_ui.cc
+++ b/chrome/browser/ui/webui/remoting_ui.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/remoting_ui.h"
+#include "chrome/browser/ui/webui/remoting_ui.h"
#include "base/singleton.h"
#include "chrome/browser/browser_thread.h"
diff --git a/chrome/browser/webui/remoting_ui.h b/chrome/browser/ui/webui/remoting_ui.h
similarity index 78%
rename from chrome/browser/webui/remoting_ui.h
rename to chrome/browser/ui/webui/remoting_ui.h
index 3faeceb..d5c43d9 100644
--- a/chrome/browser/webui/remoting_ui.h
+++ b/chrome/browser/ui/webui/remoting_ui.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_REMOTING_UI_H_
-#define CHROME_BROWSER_WEBUI_REMOTING_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_REMOTING_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_REMOTING_UI_H_
#pragma once
#include "content/browser/webui/web_ui.h"
@@ -22,4 +22,4 @@
DISALLOW_COPY_AND_ASSIGN(RemotingUI);
};
-#endif // CHROME_BROWSER_WEBUI_REMOTING_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_REMOTING_UI_H_
diff --git a/chrome/browser/webui/slideshow_ui.cc b/chrome/browser/ui/webui/slideshow_ui.cc
similarity index 99%
rename from chrome/browser/webui/slideshow_ui.cc
rename to chrome/browser/ui/webui/slideshow_ui.cc
index 81a555c..b8080ea 100644
--- a/chrome/browser/webui/slideshow_ui.cc
+++ b/chrome/browser/ui/webui/slideshow_ui.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/slideshow_ui.h"
+#include "chrome/browser/ui/webui/slideshow_ui.h"
#include "base/callback.h"
#include "base/message_loop.h"
diff --git a/chrome/browser/webui/slideshow_ui.h b/chrome/browser/ui/webui/slideshow_ui.h
similarity index 71%
rename from chrome/browser/webui/slideshow_ui.h
rename to chrome/browser/ui/webui/slideshow_ui.h
index a647f92..fd7413ab 100644
--- a/chrome/browser/webui/slideshow_ui.h
+++ b/chrome/browser/ui/webui/slideshow_ui.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_SLIDESHOW_UI_H_
-#define CHROME_BROWSER_WEBUI_SLIDESHOW_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_SLIDESHOW_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_SLIDESHOW_UI_H_
#pragma once
#include "content/browser/webui/web_ui.h"
@@ -16,4 +16,4 @@
DISALLOW_COPY_AND_ASSIGN(SlideshowUI);
};
-#endif // CHROME_BROWSER_WEBUI_SLIDESHOW_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_SLIDESHOW_UI_H_
diff --git a/chrome/browser/webui/sync_internals_ui.cc b/chrome/browser/ui/webui/sync_internals_ui.cc
similarity index 97%
rename from chrome/browser/webui/sync_internals_ui.cc
rename to chrome/browser/ui/webui/sync_internals_ui.cc
index 3f1a12f..5edfbccf 100644
--- a/chrome/browser/webui/sync_internals_ui.cc
+++ b/chrome/browser/ui/webui/sync_internals_ui.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_ui.h"
+#include "chrome/browser/ui/webui/sync_internals_ui.h"
#include <string>
diff --git a/chrome/browser/webui/sync_internals_ui.h b/chrome/browser/ui/webui/sync_internals_ui.h
similarity index 90%
rename from chrome/browser/webui/sync_internals_ui.h
rename to chrome/browser/ui/webui/sync_internals_ui.h
index 167d9fd..0afdca4 100644
--- a/chrome/browser/webui/sync_internals_ui.h
+++ b/chrome/browser/ui/webui/sync_internals_ui.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_SYNC_INTERNALS_UI_H_
-#define CHROME_BROWSER_WEBUI_SYNC_INTERNALS_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_SYNC_INTERNALS_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_SYNC_INTERNALS_UI_H_
#pragma once
#include <string>
@@ -50,4 +50,4 @@
DISALLOW_COPY_AND_ASSIGN(SyncInternalsUI);
};
-#endif // CHROME_BROWSER_WEBUI_SYNC_INTERNALS_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_SYNC_INTERNALS_UI_H_
diff --git a/chrome/browser/webui/sync_internals_ui_unittest.cc b/chrome/browser/ui/webui/sync_internals_ui_unittest.cc
similarity index 98%
rename from chrome/browser/webui/sync_internals_ui_unittest.cc
rename to chrome/browser/ui/webui/sync_internals_ui_unittest.cc
index 5298a5b..379a704 100644
--- a/chrome/browser/webui/sync_internals_ui_unittest.cc
+++ b/chrome/browser/ui/webui/sync_internals_ui_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/sync_internals_ui.h"
+#include "chrome/browser/ui/webui/sync_internals_ui.h"
#include <cstddef>
#include <string>
diff --git a/chrome/browser/webui/textfields_ui.cc b/chrome/browser/ui/webui/textfields_ui.cc
similarity index 97%
rename from chrome/browser/webui/textfields_ui.cc
rename to chrome/browser/ui/webui/textfields_ui.cc
index f8a25ea..73217e077 100644
--- a/chrome/browser/webui/textfields_ui.cc
+++ b/chrome/browser/ui/webui/textfields_ui.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/textfields_ui.h"
+#include "chrome/browser/ui/webui/textfields_ui.h"
#include <algorithm>
#include <string>
diff --git a/chrome/browser/webui/textfields_ui.h b/chrome/browser/ui/webui/textfields_ui.h
similarity index 92%
rename from chrome/browser/webui/textfields_ui.h
rename to chrome/browser/ui/webui/textfields_ui.h
index def96b07..1b629824 100644
--- a/chrome/browser/webui/textfields_ui.h
+++ b/chrome/browser/ui/webui/textfields_ui.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_TEXTFIELDS_UI_H_
-#define CHROME_BROWSER_WEBUI_TEXTFIELDS_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_TEXTFIELDS_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_TEXTFIELDS_UI_H_
#pragma once
#include <string>
@@ -68,4 +68,4 @@
DISALLOW_COPY_AND_ASSIGN(TextfieldsUI);
};
-#endif // CHROME_BROWSER_WEBUI_TEXTFIELDS_UI_H_
+#endif // CHROME_BROWSER_UI_WEBUI_TEXTFIELDS_UI_H_
diff --git a/chrome/browser/webui/foreign_session_handler.cc b/chrome/browser/webui/foreign_session_handler.cc
index 5c85433..6c6b2e7b 100644
--- a/chrome/browser/webui/foreign_session_handler.cc
+++ b/chrome/browser/webui/foreign_session_handler.cc
@@ -11,11 +11,11 @@
#include "base/string_number_conversions.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
-#include "chrome/browser/webui/new_tab_ui.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sessions/session_restore.h"
#include "chrome/browser/sync/engine/syncapi.h"
#include "chrome/browser/sync/profile_sync_service.h"
+#include "chrome/browser/ui/webui/new_tab_ui.h"
#include "chrome/common/notification_details.h"
#include "chrome/common/notification_service.h"
#include "chrome/common/url_constants.h"
diff --git a/chrome/browser/webui/mediaplayer_browsertest.cc b/chrome/browser/webui/mediaplayer_browsertest.cc
index 17958e2..a02ed6e 100644
--- a/chrome/browser/webui/mediaplayer_browsertest.cc
+++ b/chrome/browser/webui/mediaplayer_browsertest.cc
@@ -8,7 +8,7 @@
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/webui/mediaplayer_ui.h"
+#include "chrome/browser/ui/webui/mediaplayer_ui.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/url_constants.h"
#include "chrome/test/automation/dom_element_proxy.h"
diff --git a/chrome/browser/webui/most_visited_handler.cc b/chrome/browser/webui/most_visited_handler.cc
index a992d355..b171f67 100644
--- a/chrome/browser/webui/most_visited_handler.cc
+++ b/chrome/browser/webui/most_visited_handler.cc
@@ -22,9 +22,9 @@
#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/new_tab_ui.h"
#include "chrome/browser/webui/chrome_url_data_manager.h"
#include "chrome/browser/webui/favicon_source.h"
-#include "chrome/browser/webui/new_tab_ui.h"
#include "chrome/browser/webui/thumbnail_source.h"
#include "chrome/common/notification_source.h"
#include "chrome/common/notification_type.h"
diff --git a/chrome/browser/webui/value_helper.cc b/chrome/browser/webui/value_helper.cc
index f18e0d4c..ca8c532 100644
--- a/chrome/browser/webui/value_helper.cc
+++ b/chrome/browser/webui/value_helper.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/webui/value_helper.h"
-#include "chrome/browser/webui/new_tab_ui.h"
+#include "chrome/browser/ui/webui/new_tab_ui.h"
#include "chrome/common/url_constants.h"
bool ValueHelper::TabToValue(
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index cf9d6b2..ad277b7 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3239,6 +3239,38 @@
'browser/ui/views/window.h',
'browser/ui/views/wrench_menu.cc',
'browser/ui/views/wrench_menu.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/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_ui.cc',
+ 'browser/ui/webui/downloads_ui.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/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_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/net_internals_ui.cc',
+ 'browser/ui/webui/net_internals_ui.h',
+ 'browser/ui/webui/new_tab_ui.cc',
+ 'browser/ui/webui/new_tab_ui.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',
@@ -3289,6 +3321,20 @@
'browser/ui/webui/options/search_engine_manager_handler.h',
'browser/ui/webui/options/stop_syncing_handler.cc',
'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_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/slideshow_ui.cc',
+ 'browser/ui/webui/slideshow_ui.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/window_sizer.cc',
'browser/ui/window_sizer.h',
'browser/ui/window_sizer_linux.cc',
@@ -3328,86 +3374,40 @@
'browser/webdata/web_database_win.cc',
'browser/webui/app_launcher_handler.cc',
'browser/webui/app_launcher_handler.h',
- 'browser/webui/bookmarks_ui.cc',
- 'browser/webui/bookmarks_ui.h',
- 'browser/webui/bug_report_ui.cc',
- 'browser/webui/bug_report_ui.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/constrained_html_ui.cc',
- 'browser/webui/constrained_html_ui.h',
- 'browser/webui/crashes_ui.cc',
- 'browser/webui/crashes_ui.h',
- 'browser/webui/devtools_ui.cc',
- 'browser/webui/devtools_ui.h',
'browser/webui/downloads_dom_handler.cc',
'browser/webui/downloads_dom_handler.h',
- 'browser/webui/downloads_ui.cc',
- 'browser/webui/downloads_ui.h',
'browser/webui/favicon_source.cc',
'browser/webui/favicon_source.h',
- 'browser/webui/filebrowse_ui.cc',
- 'browser/webui/filebrowse_ui.h',
'browser/webui/fileicon_source.cc',
'browser/webui/fileicon_source.h',
- 'browser/webui/flags_ui.cc',
- 'browser/webui/flags_ui.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/gpu_internals_ui.cc',
- 'browser/webui/gpu_internals_ui.h',
- 'browser/webui/history2_ui.cc',
- 'browser/webui/history2_ui.h',
- 'browser/webui/history_ui.cc',
- 'browser/webui/history_ui.h',
'browser/webui/html_dialog_tab_contents_delegate.cc',
'browser/webui/html_dialog_tab_contents_delegate.h',
- 'browser/webui/html_dialog_ui.cc',
- 'browser/webui/html_dialog_ui.h',
- 'browser/webui/keyboard_ui.cc',
- 'browser/webui/keyboard_ui.h',
- 'browser/webui/mediaplayer_ui.cc',
- 'browser/webui/mediaplayer_ui.h',
'browser/webui/most_visited_handler.cc',
'browser/webui/most_visited_handler.h',
- 'browser/webui/net_internals_ui.cc',
- 'browser/webui/net_internals_ui.h',
'browser/webui/new_tab_page_sync_handler.cc',
'browser/webui/new_tab_page_sync_handler.h',
- 'browser/webui/new_tab_ui.cc',
- 'browser/webui/new_tab_ui.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/plugins_ui.cc',
- 'browser/webui/plugins_ui.h',
'browser/webui/print_preview_handler.cc',
'browser/webui/print_preview_handler.h',
- 'browser/webui/print_preview_ui.cc',
- 'browser/webui/print_preview_ui.h',
- 'browser/webui/print_preview_ui_html_source.cc',
- 'browser/webui/print_preview_ui_html_source.h',
- 'browser/webui/remoting_ui.cc',
- 'browser/webui/remoting_ui.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/slideshow_ui.cc',
- 'browser/webui/slideshow_ui.h',
'browser/webui/sync_internals_html_source.cc',
'browser/webui/sync_internals_html_source.h',
- 'browser/webui/sync_internals_ui.cc',
- 'browser/webui/sync_internals_ui.h',
- 'browser/webui/textfields_ui.cc',
- 'browser/webui/textfields_ui.h',
'browser/webui/theme_source.cc',
'browser/webui/theme_source.h',
'browser/webui/thumbnail_source.cc',
@@ -3449,9 +3449,9 @@
['exclude', 'browser/policy/device_policy_identity_strategy.h'],
['exclude', 'browser/renderer_host/offline_resource_handler.cc'],
['exclude', 'browser/renderer_host/offline_resource_handler.h'],
- ['exclude', 'browser/webui/filebrowse_ui.cc'],
- ['exclude', 'browser/webui/mediaplayer_ui.cc'],
- ['exclude', 'browser/webui/slideshow_ui.cc'],
+ ['exclude', 'browser/ui/webui/filebrowse_ui.cc'],
+ ['exclude', 'browser/ui/webui/mediaplayer_ui.cc'],
+ ['exclude', 'browser/ui/webui/slideshow_ui.cc'],
],
}],
['chromeos==1', {
@@ -3783,8 +3783,8 @@
'sources': [
# Using built-in rule in vstudio for midl.
'browser/history/history_indexer.idl',
- 'browser/webui/conflicts_ui.cc',
- 'browser/webui/conflicts_ui.h',
+ 'browser/ui/webui/conflicts_ui.cc',
+ 'browser/ui/webui/conflicts_ui.h',
],
'sources!': [
'browser/history/history_publisher_none.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index ec36bbf..67d3ed8 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -573,10 +573,10 @@
'browser/ui/login/login_prompt_uitest.cc',
'browser/ui/tests/browser_uitest.cc',
'browser/ui/views/find_bar_host_uitest.cc',
+ 'browser/ui/webui/bookmarks_ui_uitest.cc',
+ 'browser/ui/webui/new_tab_ui_uitest.cc',
'browser/ui/webui/options/options_ui_uitest.cc',
- 'browser/webui/bookmarks_ui_uitest.cc',
- 'browser/webui/new_tab_ui_uitest.cc',
- 'browser/webui/print_preview_ui_uitest.cc',
+ 'browser/ui/webui/print_preview_ui_uitest.cc',
'common/logging_chrome_uitest.cc',
'renderer/external_extension_uitest.cc',
'test/automation/automation_proxy_uitest.cc',
@@ -691,7 +691,7 @@
['chromeos==1', {
'sources!': [
# TODO(thestig): Enable when print preview is ready for CrOS.
- 'browser/webui/print_preview_ui_uitest.cc',
+ 'browser/ui/webui/print_preview_ui_uitest.cc',
],
}],
],
@@ -1723,6 +1723,8 @@
'browser/ui/views/shell_dialogs_win_unittest.cc',
'browser/ui/views/status_icons/status_tray_win_unittest.cc',
'browser/ui/webui/options/language_options_handler_unittest.cc',
+ 'browser/ui/webui/print_preview_ui_html_source_unittest.cc',
+ 'browser/ui/webui/sync_internals_ui_unittest.cc',
'browser/ui/window_sizer_unittest.cc',
'browser/ui/window_snapshot/window_snapshot_mac_unittest.mm',
'browser/user_style_sheet_watcher_unittest.cc',
@@ -1732,9 +1734,7 @@
'browser/webdata/web_data_service_unittest.cc',
'browser/webdata/web_database_unittest.cc',
'browser/webui/html_dialog_tab_contents_delegate_unittest.cc',
- 'browser/webui/print_preview_ui_html_source_unittest.cc',
'browser/webui/shown_sections_handler_unittest.cc',
- 'browser/webui/sync_internals_ui_unittest.cc',
'browser/webui/theme_source_unittest.cc',
'browser/web_resource/promo_resource_service_unittest.cc',
'common/bzip2_unittest.cc',
@@ -1880,7 +1880,7 @@
# TODO(thestig) Enable PrintPreviewUIHTMLSource tests on CrOS when
# print preview is enabled on CrOS.
['exclude', 'browser/notifications/desktop_notifications_unittest.cc'],
- ['exclude', 'browser/webui/print_preview_ui_html_source_unittest.cc'],
+ ['exclude', 'browser/ui/webui/print_preview_ui_html_source_unittest.cc'],
],
}, { # else: chromeos == 0
'sources/': [
@@ -2417,7 +2417,7 @@
],
'sources': [
# TODO(estade): port to win/mac.
- 'browser/webui/constrained_html_ui_browsertest.cc',
+ 'browser/ui/webui/constrained_html_ui_browsertest.cc',
],
}],
['OS=="mac"', {
@@ -2462,7 +2462,7 @@
],
'sources!': [
# TODO(estade): port to linux/views.
- 'browser/webui/constrained_html_ui_browsertest.cc',
+ 'browser/ui/webui/constrained_html_ui_browsertest.cc',
],
}, { # else: toolkit_views == 0
'sources!': [
