diff options
86 files changed, 107 insertions, 107 deletions
diff --git a/chrome/browser/browser_signin.cc b/chrome/browser/browser_signin.cc index 815195e1..c23955f 100644 --- a/chrome/browser/browser_signin.cc +++ b/chrome/browser/browser_signin.cc @@ -23,13 +23,13 @@ #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/browser/webui/web_ui_util.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "content/browser/webui/web_ui_util.h" #include "grit/browser_resources.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/browser_url_handler.cc b/chrome/browser/browser_url_handler.cc index 4a6d1a6..4234ea2 100644 --- a/chrome/browser/browser_url_handler.cc +++ b/chrome/browser/browser_url_handler.cc @@ -8,8 +8,8 @@ #include "chrome/browser/browser_about_handler.h" #include "chrome/browser/extensions/extension_web_ui.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/webui/web_ui_factory.h" #include "chrome/common/url_constants.h" +#include "content/browser/webui/web_ui_factory.h" #include "googleurl/src/gurl.h" // Handles rewriting view-source URLs for what we'll actually load. diff --git a/chrome/browser/chromeos/login/web_page_view.cc b/chrome/browser/chromeos/login/web_page_view.cc index 4dcc72d..82b44eb 100644 --- a/chrome/browser/chromeos/login/web_page_view.cc +++ b/chrome/browser/chromeos/login/web_page_view.cc @@ -13,8 +13,8 @@ #include "chrome/browser/chromeos/login/helper.h" #include "chrome/browser/chromeos/login/rounded_rect_painter.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/webui/web_ui.h" #include "chrome/common/bindings_policy.h" +#include "content/browser/webui/web_ui.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ipc/ipc_message.h" diff --git a/chrome/browser/chromeos/notifications/system_notification.cc b/chrome/browser/chromeos/notifications/system_notification.cc index 6aacf26..2e5ab14 100644 --- a/chrome/browser/chromeos/notifications/system_notification.cc +++ b/chrome/browser/chromeos/notifications/system_notification.cc @@ -9,7 +9,7 @@ #include "chrome/browser/chromeos/notifications/system_notification_factory.h" #include "chrome/browser/notifications/notification.h" #include "chrome/browser/notifications/notification_ui_manager.h" -#include "chrome/browser/webui/web_ui_util.h" +#include "content/browser/webui/web_ui_util.h" namespace chromeos { diff --git a/chrome/browser/chromeos/webui/accounts_options_handler.cc b/chrome/browser/chromeos/webui/accounts_options_handler.cc index 7ec29f0..d1a4d1d 100644 --- a/chrome/browser/chromeos/webui/accounts_options_handler.cc +++ b/chrome/browser/chromeos/webui/accounts_options_handler.cc @@ -12,8 +12,8 @@ #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/user_cros_settings_provider.h" #include "chrome/browser/webui/options/options_managed_banner_handler.h" -#include "chrome/browser/webui/web_ui_util.h" #include "chrome/common/url_constants.h" +#include "content/browser/webui/web_ui_util.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/chromeos/webui/imageburner_ui.h b/chrome/browser/chromeos/webui/imageburner_ui.h index e1f1ef20..ca3c31b 100644 --- a/chrome/browser/chromeos/webui/imageburner_ui.h +++ b/chrome/browser/chromeos/webui/imageburner_ui.h @@ -21,7 +21,7 @@ #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/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" #include "googleurl/src/gurl.h" #include "net/base/file_stream.h" #include "ui/base/dragdrop/download_file_interface.h" diff --git a/chrome/browser/chromeos/webui/internet_options_handler.cc b/chrome/browser/chromeos/webui/internet_options_handler.cc index a6c34cd..88c19a2 100644 --- a/chrome/browser/chromeos/webui/internet_options_handler.cc +++ b/chrome/browser/chromeos/webui/internet_options_handler.cc @@ -26,8 +26,8 @@ #include "chrome/browser/chromeos/status/network_menu.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/views/window.h" -#include "chrome/browser/webui/web_ui_util.h" #include "chrome/common/time_format.h" +#include "content/browser/webui/web_ui_util.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/chromeos/webui/login/login_ui.h b/chrome/browser/chromeos/webui/login/login_ui.h index 58f09bf..c40fd9a 100644 --- a/chrome/browser/chromeos/webui/login/login_ui.h +++ b/chrome/browser/chromeos/webui/login/login_ui.h @@ -11,7 +11,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/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" class Profile; diff --git a/chrome/browser/chromeos/webui/menu_ui.cc b/chrome/browser/chromeos/webui/menu_ui.cc index 7ed1f4a..d3ac25d 100644 --- a/chrome/browser/chromeos/webui/menu_ui.cc +++ b/chrome/browser/chromeos/webui/menu_ui.cc @@ -22,10 +22,10 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_delegate.h" -#include "chrome/browser/webui/web_ui_util.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/url_constants.h" +#include "content/browser/webui/web_ui_util.h" #include "grit/app_resources.h" #include "grit/browser_resources.h" #include "ui/base/models/menu_model.h" diff --git a/chrome/browser/chromeos/webui/menu_ui.h b/chrome/browser/chromeos/webui/menu_ui.h index b32e1b6..736f449 100644 --- a/chrome/browser/chromeos/webui/menu_ui.h +++ b/chrome/browser/chromeos/webui/menu_ui.h @@ -9,7 +9,7 @@ #include <string> #include "chrome/browser/webui/chrome_url_data_manager.h" -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" class DictionaryValue; diff --git a/chrome/browser/chromeos/webui/mobile_setup_ui.h b/chrome/browser/chromeos/webui/mobile_setup_ui.h index fb00b23..2a2acad 100644 --- a/chrome/browser/chromeos/webui/mobile_setup_ui.h +++ b/chrome/browser/chromeos/webui/mobile_setup_ui.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_WEBUI_MOBILE_SETUP_UI_H_ #pragma once -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" // A custom WebUI that defines datasource for mobile setup registration page // that is used in Chrome OS activate modem and perform plan subscription tasks. diff --git a/chrome/browser/chromeos/webui/register_page_ui.h b/chrome/browser/chromeos/webui/register_page_ui.h index fdad943..9cf0c1e 100644 --- a/chrome/browser/chromeos/webui/register_page_ui.h +++ b/chrome/browser/chromeos/webui/register_page_ui.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_WEBUI_REGISTER_PAGE_UI_H_ #pragma once -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" // A custom WebUI that defines datasource for host registration page that // is used in Chrome OS to register product on first sign in. diff --git a/chrome/browser/chromeos/webui/system_info_ui.h b/chrome/browser/chromeos/webui/system_info_ui.h index 68da264..c544ac204c 100644 --- a/chrome/browser/chromeos/webui/system_info_ui.h +++ b/chrome/browser/chromeos/webui/system_info_ui.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_WEBUI_SYSTEM_INFO_UI_H_ #pragma once -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" class SystemInfoUI : public WebUI { public: diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc index 3b4e70a..863807a 100644 --- a/chrome/browser/extensions/extension_host.cc +++ b/chrome/browser/extensions/extension_host.cc @@ -33,7 +33,6 @@ #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/ui/app_modal_dialogs/message_box_handler.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/webui/web_ui_factory.h" #include "chrome/common/bindings_policy.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" @@ -44,6 +43,7 @@ #include "chrome/common/url_constants.h" #include "chrome/common/view_types.h" #include "content/browser/browsing_instance.h" +#include "content/browser/webui/web_ui_factory.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "ui/base/keycodes/keyboard_codes.h" diff --git a/chrome/browser/extensions/extension_web_ui.h b/chrome/browser/extensions/extension_web_ui.h index 343eb58..ad35865 100644 --- a/chrome/browser/extensions/extension_web_ui.h +++ b/chrome/browser/extensions/extension_web_ui.h @@ -12,8 +12,8 @@ #include "chrome/browser/extensions/extension_bookmark_manager_api.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" #include "chrome/browser/favicon_service.h" -#include "chrome/browser/webui/web_ui.h" #include "chrome/common/extensions/extension.h" +#include "content/browser/webui/web_ui.h" class GURL; class ListValue; diff --git a/chrome/browser/extensions/extensions_ui.h b/chrome/browser/extensions/extensions_ui.h index 5874f4c..cf3d618 100644 --- a/chrome/browser/extensions/extensions_ui.h +++ b/chrome/browser/extensions/extensions_ui.h @@ -14,10 +14,10 @@ #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/webui/web_ui.h" #include "chrome/common/extensions/extension_resource.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "content/browser/webui/web_ui.h" #include "googleurl/src/gurl.h" class DictionaryValue; diff --git a/chrome/browser/favicon_service.cc b/chrome/browser/favicon_service.cc index 9dbb010..3a30949 100644 --- a/chrome/browser/favicon_service.cc +++ b/chrome/browser/favicon_service.cc @@ -7,8 +7,8 @@ #include "chrome/browser/history/history.h" #include "chrome/browser/history/history_backend.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/webui/web_ui_factory.h" #include "chrome/common/url_constants.h" +#include "content/browser/webui/web_ui_factory.h" FaviconService::FaviconService(Profile* profile) : profile_(profile) { } 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 edfb044..7a012f5 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc @@ -26,12 +26,12 @@ #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/webui/web_ui_util.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" #include "chrome/common/pref_names.h" #include "chrome/common/service_messages.h" +#include "content/browser/webui/web_ui_util.h" #include "grit/chromium_strings.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_font_util.h" diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_message_handler.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_message_handler.cc index f331461..d4aaad7 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_message_handler.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_message_handler.cc @@ -8,7 +8,7 @@ #include "base/json/json_writer.h" #include "base/scoped_ptr.h" #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h" -#include "chrome/browser/webui/web_ui_util.h" +#include "content/browser/webui/web_ui_util.h" WebUIMessageHandler* CloudPrintSetupMessageHandler::Attach(WebUI* web_ui) { // Pass the WebUI object to the setup flow. diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc index d25595c..7028b86 100644 --- a/chrome/browser/printing/print_dialog_cloud.cc +++ b/chrome/browser/printing/print_dialog_cloud.cc @@ -20,14 +20,14 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/ui/browser_dialogs.h" -#include "chrome/browser/webui/web_ui.h" -#include "chrome/browser/webui/web_ui_util.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" #include "chrome/common/render_messages_params.h" #include "chrome/common/url_constants.h" +#include "content/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui_util.h" #include "ui/base/l10n/l10n_util.h" #include "webkit/glue/webpreferences.h" diff --git a/chrome/browser/printing/print_dialog_cloud_internal.h b/chrome/browser/printing/print_dialog_cloud_internal.h index c5ab8b6..8272c30 100644 --- a/chrome/browser/printing/print_dialog_cloud_internal.h +++ b/chrome/browser/printing/print_dialog_cloud_internal.h @@ -13,9 +13,9 @@ #include "base/scoped_ptr.h" #include "base/synchronization/lock.h" #include "chrome/browser/webui/html_dialog_ui.h" -#include "chrome/browser/webui/web_ui.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "content/browser/webui/web_ui.h" class GURL; class StringValue; diff --git a/chrome/browser/remoting/remoting_options_handler.cc b/chrome/browser/remoting/remoting_options_handler.cc index 62ce92b..9c8b735 100644 --- a/chrome/browser/remoting/remoting_options_handler.cc +++ b/chrome/browser/remoting/remoting_options_handler.cc @@ -7,8 +7,8 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/service/service_process_control_manager.h" -#include "chrome/browser/webui/web_ui.h" #include "chrome/common/remoting/chromoting_host_info.h" +#include "content/browser/webui/web_ui.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/remoting/setup_flow.h b/chrome/browser/remoting/setup_flow.h index d8c017b..5672d3f 100644 --- a/chrome/browser/remoting/setup_flow.h +++ b/chrome/browser/remoting/setup_flow.h @@ -8,8 +8,8 @@ #include "base/callback.h" #include "base/scoped_ptr.h" #include "chrome/browser/webui/html_dialog_ui.h" -#include "chrome/browser/webui/web_ui.h" #include "chrome/common/remoting/chromoting_host_info.h" +#include "content/browser/webui/web_ui.h" class ListValue; class ServiceProcessControl; diff --git a/chrome/browser/remoting/setup_flow_login_step.cc b/chrome/browser/remoting/setup_flow_login_step.cc index 5cfc08f..e58c674 100644 --- a/chrome/browser/remoting/setup_flow_login_step.cc +++ b/chrome/browser/remoting/setup_flow_login_step.cc @@ -11,9 +11,9 @@ #include "base/values.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/remoting/setup_flow_get_status_step.h" -#include "chrome/browser/webui/web_ui_util.h" #include "chrome/common/net/gaia/gaia_constants.h" #include "chrome/common/net/gaia/google_service_auth_error.h" +#include "content/browser/webui/web_ui_util.h" namespace remoting { diff --git a/chrome/browser/sync/sync_setup_flow.cc b/chrome/browser/sync/sync_setup_flow.cc index 9fd3c6c..e947c82 100644 --- a/chrome/browser/sync/sync_setup_flow.cc +++ b/chrome/browser/sync/sync_setup_flow.cc @@ -20,9 +20,9 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/browser_list.h" -#include "chrome/browser/webui/web_ui_util.h" #include "chrome/common/net/gaia/google_service_auth_error.h" #include "chrome/common/pref_names.h" +#include "content/browser/webui/web_ui_util.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_font_util.h" #include "ui/gfx/font.h" diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.h b/chrome/browser/tab_contents/render_view_host_delegate_helper.h index 87594f4..1367f9f 100644 --- a/chrome/browser/tab_contents/render_view_host_delegate_helper.h +++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.h @@ -9,8 +9,8 @@ #include <map> #include "base/basictypes.h" -#include "chrome/browser/webui/web_ui_factory.h" #include "chrome/common/window_container_type.h" +#include "content/browser/webui/web_ui_factory.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h" #include "ui/gfx/rect.h" #include "webkit/glue/webpreferences.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 5e6de43..a8c9927 100644 --- a/chrome/browser/ui/cocoa/html_dialog_window_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/html_dialog_window_controller_unittest.mm @@ -14,9 +14,9 @@ #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/webui/web_ui.h" #include "chrome/test/browser_with_test_window_test.h" #include "chrome/test/testing_profile.h" +#include "content/browser/webui/web_ui.h" #include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/webui/app_launcher_handler.h b/chrome/browser/webui/app_launcher_handler.h index d093b4a..4edff88 100644 --- a/chrome/browser/webui/app_launcher_handler.h +++ b/chrome/browser/webui/app_launcher_handler.h @@ -9,10 +9,10 @@ #include "base/scoped_ptr.h" #include "chrome/browser/extensions/extension_install_ui.h" #include "chrome/browser/prefs/pref_change_registrar.h" -#include "chrome/browser/webui/web_ui.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "content/browser/webui/web_ui.h" class Extension; class ExtensionPrefs; diff --git a/chrome/browser/webui/bookmarks_ui.h b/chrome/browser/webui/bookmarks_ui.h index 502e92d..c427d9a5 100644 --- a/chrome/browser/webui/bookmarks_ui.h +++ b/chrome/browser/webui/bookmarks_ui.h @@ -9,7 +9,7 @@ #include <string> #include "chrome/browser/webui/chrome_url_data_manager.h" -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" class GURL; class RefCountedMemory; diff --git a/chrome/browser/webui/conflicts_ui.h b/chrome/browser/webui/conflicts_ui.h index 0772769..929b381 100644 --- a/chrome/browser/webui/conflicts_ui.h +++ b/chrome/browser/webui/conflicts_ui.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_WEBUI_CONFLICTS_UI_H_ #pragma once -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" #if defined(OS_WIN) diff --git a/chrome/browser/webui/constrained_html_ui.cc b/chrome/browser/webui/constrained_html_ui.cc index b7d3542..7036cc0 100644 --- a/chrome/browser/webui/constrained_html_ui.cc +++ b/chrome/browser/webui/constrained_html_ui.cc @@ -8,8 +8,8 @@ #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/webui/web_ui_util.h" #include "chrome/common/bindings_policy.h" +#include "content/browser/webui/web_ui_util.h" static base::LazyInstance<PropertyAccessor<ConstrainedHtmlUIDelegate*> > g_constrained_html_ui_property_accessor(base::LINKER_INITIALIZED); diff --git a/chrome/browser/webui/constrained_html_ui.h b/chrome/browser/webui/constrained_html_ui.h index 6c20280..6ab78ec 100644 --- a/chrome/browser/webui/constrained_html_ui.h +++ b/chrome/browser/webui/constrained_html_ui.h @@ -9,8 +9,8 @@ #include <vector> #include "chrome/browser/tab_contents/constrained_window.h" -#include "chrome/browser/webui/web_ui.h" #include "chrome/common/property_bag.h" +#include "content/browser/webui/web_ui.h" class HtmlDialogUIDelegate; class Profile; diff --git a/chrome/browser/webui/crashes_ui.h b/chrome/browser/webui/crashes_ui.h index fddb62d..db9f0ed 100644 --- a/chrome/browser/webui/crashes_ui.h +++ b/chrome/browser/webui/crashes_ui.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_WEBUI_CRASHES_UI_H_ #pragma once -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" class RefCountedMemory; diff --git a/chrome/browser/webui/devtools_ui.h b/chrome/browser/webui/devtools_ui.h index 4ad495f..ea801e6 100644 --- a/chrome/browser/webui/devtools_ui.h +++ b/chrome/browser/webui/devtools_ui.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_WEBUI_DEVTOOLS_UI_H_ #pragma once -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" class DevToolsUI : public WebUI { public: diff --git a/chrome/browser/webui/downloads_dom_handler.h b/chrome/browser/webui/downloads_dom_handler.h index c0a6d0f..f78f3ae 100644 --- a/chrome/browser/webui/downloads_dom_handler.h +++ b/chrome/browser/webui/downloads_dom_handler.h @@ -11,7 +11,7 @@ #include "base/scoped_callback_factory.h" #include "chrome/browser/download/download_item.h" #include "chrome/browser/download/download_manager.h" -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" class ListValue; diff --git a/chrome/browser/webui/downloads_ui.h b/chrome/browser/webui/downloads_ui.h index 252807c..9f5ae06 100644 --- a/chrome/browser/webui/downloads_ui.h +++ b/chrome/browser/webui/downloads_ui.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_WEBUI_DOWNLOADS_UI_H_ #pragma once -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" class RefCountedMemory; diff --git a/chrome/browser/webui/file_browse_browsertest.cc b/chrome/browser/webui/file_browse_browsertest.cc index a580844..030b221 100644 --- a/chrome/browser/webui/file_browse_browsertest.cc +++ b/chrome/browser/webui/file_browse_browsertest.cc @@ -7,12 +7,12 @@ #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/views/html_dialog_view.h" -#include "chrome/browser/webui/web_ui.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/url_constants.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" +#include "content/browser/webui/web_ui.h" #include "net/test/test_server.h" namespace { diff --git a/chrome/browser/webui/flags_ui.h b/chrome/browser/webui/flags_ui.h index 8b19f8c..930fe2d 100644 --- a/chrome/browser/webui/flags_ui.h +++ b/chrome/browser/webui/flags_ui.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_WEBUI_FLAGS_UI_H_ #pragma once -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" class PrefService; class RefCountedMemory; diff --git a/chrome/browser/webui/foreign_session_handler.h b/chrome/browser/webui/foreign_session_handler.h index 672272b..2e23e6b 100644 --- a/chrome/browser/webui/foreign_session_handler.h +++ b/chrome/browser/webui/foreign_session_handler.h @@ -10,9 +10,9 @@ #include "chrome/browser/sessions/session_service.h" #include "chrome/browser/sync/glue/session_model_associator.h" -#include "chrome/browser/webui/web_ui.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "content/browser/webui/web_ui.h" namespace browser_sync { diff --git a/chrome/browser/webui/generic_handler.h b/chrome/browser/webui/generic_handler.h index 1f010ce..cd476db 100644 --- a/chrome/browser/webui/generic_handler.h +++ b/chrome/browser/webui/generic_handler.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_WEBUI_GENERIC_HANDLER_H_ #pragma once -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" class ListValue; diff --git a/chrome/browser/webui/gpu_internals_ui.h b/chrome/browser/webui/gpu_internals_ui.h index 0648bc1..84c4af9 100644 --- a/chrome/browser/webui/gpu_internals_ui.h +++ b/chrome/browser/webui/gpu_internals_ui.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_WEBUI_GPU_INTERNALS_UI_H_ #pragma once -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" class GpuInternalsUI : public WebUI { public: diff --git a/chrome/browser/webui/history2_ui.h b/chrome/browser/webui/history2_ui.h index d7fb4f1..bfc8472 100644 --- a/chrome/browser/webui/history2_ui.h +++ b/chrome/browser/webui/history2_ui.h @@ -12,8 +12,8 @@ #include "chrome/browser/cancelable_request.h" #include "chrome/browser/history/history.h" #include "chrome/browser/webui/chrome_url_data_manager.h" -#include "chrome/browser/webui/web_ui.h" #include "chrome/common/notification_registrar.h" +#include "content/browser/webui/web_ui.h" class GURL; diff --git a/chrome/browser/webui/history_ui.h b/chrome/browser/webui/history_ui.h index 553cb0b..8815566 100644 --- a/chrome/browser/webui/history_ui.h +++ b/chrome/browser/webui/history_ui.h @@ -12,8 +12,8 @@ #include "chrome/browser/cancelable_request.h" #include "chrome/browser/history/history.h" #include "chrome/browser/webui/chrome_url_data_manager.h" -#include "chrome/browser/webui/web_ui.h" #include "chrome/common/notification_registrar.h" +#include "content/browser/webui/web_ui.h" class GURL; diff --git a/chrome/browser/webui/html_dialog_ui.cc b/chrome/browser/webui/html_dialog_ui.cc index a755c8e..f1958a2 100644 --- a/chrome/browser/webui/html_dialog_ui.cc +++ b/chrome/browser/webui/html_dialog_ui.cc @@ -9,8 +9,8 @@ #include "base/values.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/webui/web_ui_util.h" #include "chrome/common/bindings_policy.h" +#include "content/browser/webui/web_ui_util.h" static base::LazyInstance<PropertyAccessor<HtmlDialogUIDelegate*> > g_html_dialog_ui_property_accessor(base::LINKER_INITIALIZED); diff --git a/chrome/browser/webui/html_dialog_ui.h b/chrome/browser/webui/html_dialog_ui.h index 4ccc3ee0..ce3163e 100644 --- a/chrome/browser/webui/html_dialog_ui.h +++ b/chrome/browser/webui/html_dialog_ui.h @@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "chrome/browser/webui/web_ui.h" #include "chrome/common/property_bag.h" +#include "content/browser/webui/web_ui.h" #include "googleurl/src/gurl.h" namespace gfx { diff --git a/chrome/browser/webui/keyboard_ui.h b/chrome/browser/webui/keyboard_ui.h index dd112d6..039d0cb 100644 --- a/chrome/browser/webui/keyboard_ui.h +++ b/chrome/browser/webui/keyboard_ui.h @@ -9,7 +9,7 @@ #include <string> #include "chrome/browser/webui/chrome_url_data_manager.h" -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" class Profile; diff --git a/chrome/browser/webui/mediaplayer_ui.h b/chrome/browser/webui/mediaplayer_ui.h index 85af3e7..94dd120 100644 --- a/chrome/browser/webui/mediaplayer_ui.h +++ b/chrome/browser/webui/mediaplayer_ui.h @@ -10,11 +10,11 @@ #include <vector> #include "chrome/browser/webui/chrome_url_data_manager.h" -#include "chrome/browser/webui/web_ui.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" +#include "content/browser/webui/web_ui.h" #include "net/base/directory_lister.h" #include "net/url_request/url_request.h" diff --git a/chrome/browser/webui/most_visited_handler.h b/chrome/browser/webui/most_visited_handler.h index e93ed29..60e9ba8 100644 --- a/chrome/browser/webui/most_visited_handler.h +++ b/chrome/browser/webui/most_visited_handler.h @@ -11,9 +11,9 @@ #include "chrome/browser/cancelable_request.h" #include "chrome/browser/history/history_types.h" -#include "chrome/browser/webui/web_ui.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "content/browser/webui/web_ui.h" class DictionaryValue; class GURL; diff --git a/chrome/browser/webui/net_internals_ui.h b/chrome/browser/webui/net_internals_ui.h index c00612a..a5edf55 100644 --- a/chrome/browser/webui/net_internals_ui.h +++ b/chrome/browser/webui/net_internals_ui.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_WEBUI_NET_INTERNALS_UI_H_ #pragma once -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" class NetInternalsUI : public WebUI { public: diff --git a/chrome/browser/webui/new_tab_page_sync_handler.h b/chrome/browser/webui/new_tab_page_sync_handler.h index 3a9e4a7..3291533 100644 --- a/chrome/browser/webui/new_tab_page_sync_handler.h +++ b/chrome/browser/webui/new_tab_page_sync_handler.h @@ -10,7 +10,7 @@ #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/sync_ui_util.h" -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" class ListValue; diff --git a/chrome/browser/webui/new_tab_ui.h b/chrome/browser/webui/new_tab_ui.h index 777643b..3d152dc 100644 --- a/chrome/browser/webui/new_tab_ui.h +++ b/chrome/browser/webui/new_tab_ui.h @@ -12,9 +12,9 @@ #include "base/timer.h" #include "chrome/browser/sessions/tab_restore_service.h" #include "chrome/browser/webui/chrome_url_data_manager.h" -#include "chrome/browser/webui/web_ui.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "content/browser/webui/web_ui.h" class GURL; class MessageLoop; diff --git a/chrome/browser/webui/ntp_login_handler.cc b/chrome/browser/webui/ntp_login_handler.cc index 909ba8e..d8206f3 100644 --- a/chrome/browser/webui/ntp_login_handler.cc +++ b/chrome/browser/webui/ntp_login_handler.cc @@ -12,9 +12,9 @@ #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/web_ui_util.h" #include "chrome/common/notification_details.h" #include "chrome/common/pref_names.h" +#include "content/browser/webui/web_ui_util.h" NTPLoginHandler::NTPLoginHandler() { } diff --git a/chrome/browser/webui/ntp_login_handler.h b/chrome/browser/webui/ntp_login_handler.h index 7921cf9..2f0a417 100644 --- a/chrome/browser/webui/ntp_login_handler.h +++ b/chrome/browser/webui/ntp_login_handler.h @@ -7,8 +7,8 @@ #pragma once #include "chrome/browser/prefs/pref_member.h" -#include "chrome/browser/webui/web_ui.h" #include "chrome/common/notification_observer.h" +#include "content/browser/webui/web_ui.h" // The NTP login handler currently simply displays the current logged in // username at the top of the NTP (and update itself when that changes). diff --git a/chrome/browser/webui/options/autofill_options_handler.cc b/chrome/browser/webui/options/autofill_options_handler.cc index 1ffdad5..bed379a 100644 --- a/chrome/browser/webui/options/autofill_options_handler.cc +++ b/chrome/browser/webui/options/autofill_options_handler.cc @@ -14,8 +14,8 @@ #include "chrome/browser/autofill/autofill_profile.h" #include "chrome/browser/autofill/credit_card.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/webui/web_ui_util.h" #include "chrome/common/guid.h" +#include "content/browser/webui/web_ui_util.h" #include "grit/generated_resources.h" #include "grit/webkit_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/webui/options/options_managed_banner_handler.cc b/chrome/browser/webui/options/options_managed_banner_handler.cc index 25cf5a3..43f59d0 100644 --- a/chrome/browser/webui/options/options_managed_banner_handler.cc +++ b/chrome/browser/webui/options/options_managed_banner_handler.cc @@ -7,7 +7,7 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" OptionsManagedBannerHandler::OptionsManagedBannerHandler( WebUI* web_ui, const string16& page_name, OptionsPage page) diff --git a/chrome/browser/webui/options/options_ui.h b/chrome/browser/webui/options/options_ui.h index e708b6c..7f04c55 100644 --- a/chrome/browser/webui/options/options_ui.h +++ b/chrome/browser/webui/options/options_ui.h @@ -10,10 +10,10 @@ #include "base/scoped_ptr.h" #include "chrome/browser/webui/chrome_url_data_manager.h" -#include "chrome/browser/webui/web_ui.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/notification_type.h" +#include "content/browser/webui/web_ui.h" class GURL; class PrefService; diff --git a/chrome/browser/webui/options/personal_options_handler.cc b/chrome/browser/webui/options/personal_options_handler.cc index 8407f1c..e78b1b3 100644 --- a/chrome/browser/webui/options/personal_options_handler.cc +++ b/chrome/browser/webui/options/personal_options_handler.cc @@ -36,7 +36,7 @@ #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/login/user_manager.h" -#include "chrome/browser/webui/web_ui_util.h" +#include "content/browser/webui/web_ui_util.h" #include "third_party/skia/include/core/SkBitmap.h" #endif // defined(OS_CHROMEOS) #if defined(TOOLKIT_GTK) diff --git a/chrome/browser/webui/plugins_ui.h b/chrome/browser/webui/plugins_ui.h index 2577df7..edfdc66 100644 --- a/chrome/browser/webui/plugins_ui.h +++ b/chrome/browser/webui/plugins_ui.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_WEBUI_PLUGINS_UI_H_ #pragma once -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" class PrefService; class RefCountedMemory; diff --git a/chrome/browser/webui/print_preview_handler.h b/chrome/browser/webui/print_preview_handler.h index 96d308a..864d823 100644 --- a/chrome/browser/webui/print_preview_handler.h +++ b/chrome/browser/webui/print_preview_handler.h @@ -8,7 +8,7 @@ #include "base/ref_counted.h" #include "base/weak_ptr.h" -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" namespace printing { class PrintBackend; diff --git a/chrome/browser/webui/print_preview_ui.h b/chrome/browser/webui/print_preview_ui.h index 0824d7f..55cd2b3 100644 --- a/chrome/browser/webui/print_preview_ui.h +++ b/chrome/browser/webui/print_preview_ui.h @@ -7,7 +7,7 @@ #pragma once #include "base/ref_counted.h" -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" class PrintPreviewUIHTMLSource; diff --git a/chrome/browser/webui/remoting_ui.h b/chrome/browser/webui/remoting_ui.h index 3e93bb7..3faeceb 100644 --- a/chrome/browser/webui/remoting_ui.h +++ b/chrome/browser/webui/remoting_ui.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_WEBUI_REMOTING_UI_H_ #pragma once -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" class PrefService; class RefCountedMemory; diff --git a/chrome/browser/webui/settings_browsertest.cc b/chrome/browser/webui/settings_browsertest.cc index 0042315..c92d7f2 100644 --- a/chrome/browser/webui/settings_browsertest.cc +++ b/chrome/browser/webui/settings_browsertest.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "chrome/browser/webui/options/core_options_handler.h" -#include "chrome/browser/webui/web_ui_browsertest.h" #include "chrome/common/url_constants.h" #include "chrome/test/ui_test_utils.h" +#include "content/browser/webui/web_ui_browsertest.h" #include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/webui/shown_sections_handler.h b/chrome/browser/webui/shown_sections_handler.h index 84916d2..6abf177 100644 --- a/chrome/browser/webui/shown_sections_handler.h +++ b/chrome/browser/webui/shown_sections_handler.h @@ -7,8 +7,8 @@ #pragma once #include "chrome/browser/prefs/pref_change_registrar.h" -#include "chrome/browser/webui/web_ui.h" #include "chrome/common/notification_observer.h" +#include "content/browser/webui/web_ui.h" class Extension; class Value; diff --git a/chrome/browser/webui/slideshow_ui.h b/chrome/browser/webui/slideshow_ui.h index 62a688e..a647f92 100644 --- a/chrome/browser/webui/slideshow_ui.h +++ b/chrome/browser/webui/slideshow_ui.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_WEBUI_SLIDESHOW_UI_H_ #pragma once -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" class SlideshowUI : public WebUI { public: diff --git a/chrome/browser/webui/sync_internals_ui.h b/chrome/browser/webui/sync_internals_ui.h index 3434841..167d9fd 100644 --- a/chrome/browser/webui/sync_internals_ui.h +++ b/chrome/browser/webui/sync_internals_ui.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "chrome/browser/sync/js_event_handler.h" -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" namespace browser_sync { class JsFrontend; diff --git a/chrome/browser/webui/textfields_ui.h b/chrome/browser/webui/textfields_ui.h index 7d97801..def96b07 100644 --- a/chrome/browser/webui/textfields_ui.h +++ b/chrome/browser/webui/textfields_ui.h @@ -9,7 +9,7 @@ #include <string> #include "chrome/browser/webui/chrome_url_data_manager.h" -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" class RefCountedMemory; diff --git a/chrome/browser/webui/tips_handler.h b/chrome/browser/webui/tips_handler.h index 5dd0186..802465d 100644 --- a/chrome/browser/webui/tips_handler.h +++ b/chrome/browser/webui/tips_handler.h @@ -12,7 +12,7 @@ #include <string> -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" class DictionaryValue; class ListValue; diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 8a1077a..406dc42 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -3422,12 +3422,6 @@ 'browser/webui/tips_handler.h', 'browser/webui/value_helper.cc', 'browser/webui/value_helper.h', - 'browser/webui/web_ui.cc', - 'browser/webui/web_ui.h', - 'browser/webui/web_ui_factory.cc', - 'browser/webui/web_ui_factory.h', - 'browser/webui/web_ui_util.cc', - 'browser/webui/web_ui_util.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 44ca3ba..b169a17 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1738,7 +1738,6 @@ 'browser/webui/shown_sections_handler_unittest.cc', 'browser/webui/sync_internals_ui_unittest.cc', 'browser/webui/theme_source_unittest.cc', - 'browser/webui/web_ui_unittest.cc', 'browser/web_resource/promo_resource_service_unittest.cc', 'common/bzip2_unittest.cc', 'common/child_process_logging_mac_unittest.mm', @@ -1859,6 +1858,7 @@ '../content/browser/tab_contents/navigation_controller_unittest.cc', '../content/browser/tab_contents/navigation_entry_unittest.cc', '../content/browser/tab_contents/render_view_host_manager_unittest.cc', + '../content/browser/webui/web_ui_unittest.cc', '../testing/gtest_mac_unittest.mm', '../third_party/cld/encodings/compact_lang_det/compact_lang_det_unittest_small.cc', '../webkit/fileapi/file_system_dir_url_request_job_unittest.cc', @@ -2290,10 +2290,6 @@ '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/web_ui_browsertest.cc', - 'browser/webui/web_ui_browsertest.h', - 'browser/webui/web_ui_handler_browsertest.cc', - 'browser/webui/web_ui_handler_browsertest.h', 'browser/webui/file_browse_browsertest.cc', 'browser/webui/mediaplayer_browsertest.cc', 'browser/webui/settings_browsertest.cc', @@ -2327,6 +2323,10 @@ '../content/browser/renderer_host/render_process_host_browsertest.cc', '../content/browser/renderer_host/render_view_host_browsertest.cc', '../content/browser/renderer_host/render_view_host_manager_browsertest.cc', + '../content/browser/webui/web_ui_browsertest.cc', + '../content/browser/webui/web_ui_browsertest.h', + '../content/browser/webui/web_ui_handler_browsertest.cc', + '../content/browser/webui/web_ui_handler_browsertest.h', ], 'conditions': [ ['chromeos==0', { diff --git a/content/browser/browsing_instance.cc b/content/browser/browsing_instance.cc index b2c514c..e3efa82 100644 --- a/content/browser/browsing_instance.cc +++ b/content/browser/browsing_instance.cc @@ -7,10 +7,10 @@ #include "base/command_line.h" #include "base/logging.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/webui/web_ui_factory.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" #include "content/browser/site_instance.h" +#include "content/browser/webui/web_ui_factory.h" // static BrowsingInstance::ProfileSiteInstanceMap diff --git a/content/browser/site_instance.cc b/content/browser/site_instance.cc index 6a2ef4a..8f1b53c 100644 --- a/content/browser/site_instance.cc +++ b/content/browser/site_instance.cc @@ -6,10 +6,10 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/renderer_host/browser_render_process_host.h" -#include "chrome/browser/webui/web_ui_factory.h" #include "chrome/common/notification_service.h" #include "chrome/common/url_constants.h" #include "content/browser/browsing_instance.h" +#include "content/browser/webui/web_ui_factory.h" #include "net/base/registry_controlled_domain.h" // We treat javascript:, about:crash, about:hang, and about:shorthang as the diff --git a/content/browser/tab_contents/render_view_host_manager.cc b/content/browser/tab_contents/render_view_host_manager.cc index c31dc76..5c062b2 100644 --- a/content/browser/tab_contents/render_view_host_manager.cc +++ b/content/browser/tab_contents/render_view_host_manager.cc @@ -13,8 +13,6 @@ #include "chrome/browser/renderer_host/render_view_host_factory.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" #include "chrome/browser/renderer_host/site_instance.h" -#include "chrome/browser/webui/web_ui.h" -#include "chrome/browser/webui/web_ui_factory.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" @@ -24,6 +22,8 @@ #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents_view.h" +#include "content/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui_factory.h" namespace base { class WaitableEvent; diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc index 344e1cb..f710569 100644 --- a/content/browser/tab_contents/tab_contents.cc +++ b/content/browser/tab_contents/tab_contents.cc @@ -62,7 +62,6 @@ #include "chrome/browser/tab_contents/thumbnail_generator.h" #include "chrome/browser/translate/page_translated_details.h" #include "chrome/browser/ui/app_modal_dialogs/message_box_handler.h" -#include "chrome/browser/webui/web_ui.h" #include "chrome/common/bindings_policy.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/content_restriction.h" @@ -93,6 +92,7 @@ #include "content/browser/tab_contents/tab_contents_delegate.h" #include "content/browser/tab_contents/tab_contents_observer.h" #include "content/browser/tab_contents/tab_contents_view.h" +#include "content/browser/webui/web_ui.h" #include "net/base/net_util.h" #include "net/base/registry_controlled_domain.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h index 13ccafd..2390744 100644 --- a/content/browser/tab_contents/tab_contents.h +++ b/content/browser/tab_contents/tab_contents.h @@ -22,7 +22,6 @@ #include "chrome/browser/renderer_host/render_view_host_delegate.h" #include "chrome/browser/tab_contents/tab_specific_content_settings.h" #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h" -#include "chrome/browser/webui/web_ui_factory.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/property_bag.h" #include "chrome/common/renderer_preferences.h" @@ -34,6 +33,7 @@ #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/page_navigator.h" #include "content/browser/tab_contents/render_view_host_manager.h" +#include "content/browser/webui/web_ui_factory.h" #include "net/base/load_states.h" #include "ui/gfx/native_widget_types.h" diff --git a/chrome/browser/webui/web_ui.cc b/content/browser/webui/web_ui.cc index 5c57653..11e346e 100644 --- a/chrome/browser/webui/web_ui.cc +++ b/content/browser/webui/web_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/web_ui.h" +#include "content/browser/webui/web_ui.h" #include "base/i18n/rtl.h" #include "base/json/json_writer.h" diff --git a/chrome/browser/webui/web_ui.h b/content/browser/webui/web_ui.h index 1944e3b..0ff0b15 100644 --- a/chrome/browser/webui/web_ui.h +++ b/content/browser/webui/web_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_WEB_UI_H_ -#define CHROME_BROWSER_WEBUI_WEB_UI_H_ +#ifndef CONTENT_BROWSER_WEBUI_WEB_UI_H_ +#define CONTENT_BROWSER_WEBUI_WEB_UI_H_ #pragma once #include <map> @@ -218,4 +218,4 @@ class WebUIMessageHandler { DISALLOW_COPY_AND_ASSIGN(WebUIMessageHandler); }; -#endif // CHROME_BROWSER_WEBUI_WEB_UI_H_ +#endif // CONTENT_BROWSER_WEBUI_WEB_UI_H_ diff --git a/chrome/browser/webui/web_ui_browsertest.cc b/content/browser/webui/web_ui_browsertest.cc index e94c979..18836c3 100644 --- a/chrome/browser/webui/web_ui_browsertest.cc +++ b/content/browser/webui/web_ui_browsertest.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/web_ui_browsertest.h" +#include "content/browser/webui/web_ui_browsertest.h" #include "base/path_service.h" #include "chrome/browser/tab_contents/tab_contents.h" diff --git a/chrome/browser/webui/web_ui_browsertest.h b/content/browser/webui/web_ui_browsertest.h index 7422472..000fbde 100644 --- a/chrome/browser/webui/web_ui_browsertest.h +++ b/content/browser/webui/web_ui_browsertest.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_WEB_UI_BROWSERTEST_H_ -#define CHROME_BROWSER_WEBUI_WEB_UI_BROWSERTEST_H_ +#ifndef CONTENT_BROWSER_WEBUI_WEB_UI_BROWSERTEST_H_ +#define CONTENT_BROWSER_WEBUI_WEB_UI_BROWSERTEST_H_ #pragma once #include <string> #include "base/file_path.h" -#include "chrome/browser/webui/web_ui_handler_browsertest.h" #include "chrome/test/in_process_browser_test.h" +#include "content/browser/webui/web_ui_handler_browsertest.h" class WebUIMessageHandler; @@ -55,4 +55,4 @@ class WebUIBrowserTest : public InProcessBrowserTest { FilePath test_data_directory_; }; -#endif // CHROME_BROWSER_WEBUI_WEB_UI_BROWSERTEST_H_ +#endif // CONTENT_BROWSER_WEBUI_WEB_UI_BROWSERTEST_H_ diff --git a/chrome/browser/webui/web_ui_factory.cc b/content/browser/webui/web_ui_factory.cc index 6cd39b1..f73a516 100644 --- a/chrome/browser/webui/web_ui_factory.cc +++ b/content/browser/webui/web_ui_factory.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/web_ui_factory.h" +#include "content/browser/webui/web_ui_factory.h" #include "base/command_line.h" #include "chrome/browser/about_flags.h" diff --git a/chrome/browser/webui/web_ui_factory.h b/content/browser/webui/web_ui_factory.h index 9f70871..2be656a 100644 --- a/chrome/browser/webui/web_ui_factory.h +++ b/content/browser/webui/web_ui_factory.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_WEB_UI_FACTORY_H_ -#define CHROME_BROWSER_WEBUI_WEB_UI_FACTORY_H_ +#ifndef CONTENT_BROWSER_WEBUI_WEB_UI_FACTORY_H_ +#define CONTENT_BROWSER_WEBUI_WEB_UI_FACTORY_H_ #pragma once #include "base/basictypes.h" @@ -64,4 +64,4 @@ class WebUIFactory { DISALLOW_IMPLICIT_CONSTRUCTORS(WebUIFactory); }; -#endif // CHROME_BROWSER_WEBUI_WEB_UI_FACTORY_H_ +#endif // CONTENT_BROWSER_WEBUI_WEB_UI_FACTORY_H_ diff --git a/chrome/browser/webui/web_ui_handler_browsertest.cc b/content/browser/webui/web_ui_handler_browsertest.cc index be683cfc..ab580ee 100644 --- a/chrome/browser/webui/web_ui_handler_browsertest.cc +++ b/content/browser/webui/web_ui_handler_browsertest.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/web_ui_handler_browsertest.h" +#include "content/browser/webui/web_ui_handler_browsertest.h" #include "base/utf_string_conversions.h" #include "chrome/browser/renderer_host/render_view_host.h" diff --git a/chrome/browser/webui/web_ui_handler_browsertest.h b/content/browser/webui/web_ui_handler_browsertest.h index 2ab8e1d..b19484a 100644 --- a/chrome/browser/webui/web_ui_handler_browsertest.h +++ b/content/browser/webui/web_ui_handler_browsertest.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_WEB_UI_HANDLER_BROWSERTEST_H_ -#define CHROME_BROWSER_WEBUI_WEB_UI_HANDLER_BROWSERTEST_H_ +#ifndef CONTENT_BROWSER_WEBUI_WEB_UI_HANDLER_BROWSERTEST_H_ +#define CONTENT_BROWSER_WEBUI_WEB_UI_HANDLER_BROWSERTEST_H_ #pragma once #include <string> -#include "chrome/browser/webui/web_ui.h" +#include "content/browser/webui/web_ui.h" // This class registers test framework specific handlers on WebUI objects. class WebUIHandlerBrowserTest : public WebUIMessageHandler { @@ -37,4 +37,4 @@ class WebUIHandlerBrowserTest : public WebUIMessageHandler { bool is_waiting_; }; -#endif // CHROME_BROWSER_WEBUI_WEB_UI_HANDLER_BROWSERTEST_H_ +#endif // CONTENT_BROWSER_WEBUI_WEB_UI_HANDLER_BROWSERTEST_H_ diff --git a/chrome/browser/webui/web_ui_unittest.cc b/content/browser/webui/web_ui_unittest.cc index 4c5b48b..4c5b48b 100644 --- a/chrome/browser/webui/web_ui_unittest.cc +++ b/content/browser/webui/web_ui_unittest.cc diff --git a/chrome/browser/webui/web_ui_util.cc b/content/browser/webui/web_ui_util.cc index 09fd1de..e76aaef 100644 --- a/chrome/browser/webui/web_ui_util.cc +++ b/content/browser/webui/web_ui_util.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/web_ui_util.h" +#include "content/browser/webui/web_ui_util.h" #include <vector> diff --git a/chrome/browser/webui/web_ui_util.h b/content/browser/webui/web_ui_util.h index fec80e7..d7034dc 100644 --- a/chrome/browser/webui/web_ui_util.h +++ b/content/browser/webui/web_ui_util.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_WEB_UI_UTIL_H_ -#define CHROME_BROWSER_WEBUI_WEB_UI_UTIL_H_ +#ifndef CONTENT_BROWSER_WEBUI_WEB_UI_UTIL_H_ +#define CONTENT_BROWSER_WEBUI_WEB_UI_UTIL_H_ #pragma once #include <string> @@ -46,4 +46,4 @@ std::string GetImageDataUrlFromResource(int resource_id); } // namespace web_ui_util -#endif // CHROME_BROWSER_WEBUI_WEB_UI_UTIL_H_ +#endif // CONTENT_BROWSER_WEBUI_WEB_UI_UTIL_H_ diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 9e7837e..3ca1baa 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -221,6 +221,12 @@ 'browser/tab_contents/tab_contents_observer.h', 'browser/tab_contents/tab_contents_view.cc', 'browser/tab_contents/tab_contents_view.h', + 'browser/webui/web_ui.cc', + 'browser/webui/web_ui.h', + 'browser/webui/web_ui_factory.cc', + 'browser/webui/web_ui_factory.h', + 'browser/webui/web_ui_util.cc', + 'browser/webui/web_ui_util.h', 'browser/zygote_host_linux.cc', 'browser/zygote_host_linux.h', 'browser/zygote_main_linux.cc', |