diff options
80 files changed, 104 insertions, 104 deletions
diff --git a/chrome/browser/browser_signin.cc b/chrome/browser/browser_signin.cc index bb03c8f..a01bfef 100644 --- a/chrome/browser/browser_signin.cc +++ b/chrome/browser/browser_signin.cc @@ -17,13 +17,13 @@ #include "chrome/browser/dom_ui/chrome_url_data_manager.h" #include "chrome/browser/dom_ui/constrained_html_ui.h" #include "chrome/browser/dom_ui/html_dialog_ui.h" -#include "chrome/browser/dom_ui/web_ui_util.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_host/render_view_host.h" #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/webui/web_ui_util.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_source.h" diff --git a/chrome/browser/browser_url_handler.cc b/chrome/browser/browser_url_handler.cc index beb1156..4a6d1a6 100644 --- a/chrome/browser/browser_url_handler.cc +++ b/chrome/browser/browser_url_handler.cc @@ -6,9 +6,9 @@ #include "base/string_util.h" #include "chrome/browser/browser_about_handler.h" -#include "chrome/browser/dom_ui/web_ui_factory.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 "googleurl/src/gurl.h" diff --git a/chrome/browser/browsing_instance.cc b/chrome/browser/browsing_instance.cc index b729565..e7b3a41 100644 --- a/chrome/browser/browsing_instance.cc +++ b/chrome/browser/browsing_instance.cc @@ -6,9 +6,9 @@ #include "base/command_line.h" #include "base/logging.h" -#include "chrome/browser/dom_ui/web_ui_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_host/site_instance.h" +#include "chrome/browser/webui/web_ui_factory.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/chromeos/login/web_page_view.cc b/chrome/browser/chromeos/login/web_page_view.cc index c9dd751..4dcc72d 100644 --- a/chrome/browser/chromeos/login/web_page_view.cc +++ b/chrome/browser/chromeos/login/web_page_view.cc @@ -12,8 +12,8 @@ #include "chrome/browser/child_process_security_policy.h" #include "chrome/browser/chromeos/login/helper.h" #include "chrome/browser/chromeos/login/rounded_rect_painter.h" -#include "chrome/browser/dom_ui/web_ui.h" #include "chrome/browser/tab_contents/tab_contents.h" +#include "chrome/browser/webui/web_ui.h" #include "chrome/common/bindings_policy.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/chromeos/notifications/system_notification.cc b/chrome/browser/chromeos/notifications/system_notification.cc index d02158f..6aacf26 100644 --- a/chrome/browser/chromeos/notifications/system_notification.cc +++ b/chrome/browser/chromeos/notifications/system_notification.cc @@ -7,9 +7,9 @@ #include "base/callback.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/notifications/system_notification_factory.h" -#include "chrome/browser/dom_ui/web_ui_util.h" #include "chrome/browser/notifications/notification.h" #include "chrome/browser/notifications/notification_ui_manager.h" +#include "chrome/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 65361d5..11a9548 100644 --- a/chrome/browser/chromeos/webui/accounts_options_handler.cc +++ b/chrome/browser/chromeos/webui/accounts_options_handler.cc @@ -10,7 +10,7 @@ #include "base/values.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/user_cros_settings_provider.h" -#include "chrome/browser/dom_ui/web_ui_util.h" +#include "chrome/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 cfec9c1..fc98d7d 100644 --- a/chrome/browser/chromeos/webui/imageburner_ui.h +++ b/chrome/browser/chromeos/webui/imageburner_ui.h @@ -18,10 +18,10 @@ #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/mount_library.h" #include "chrome/browser/dom_ui/chrome_url_data_manager.h" -#include "chrome/browser/dom_ui/web_ui.h" #include "chrome/browser/download/download_item.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/download/download_util.h" +#include "chrome/browser/webui/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 44a974c..c75f63a 100644 --- a/chrome/browser/chromeos/webui/internet_options_handler.cc +++ b/chrome/browser/chromeos/webui/internet_options_handler.cc @@ -24,9 +24,9 @@ #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/status/network_menu.h" -#include "chrome/browser/dom_ui/web_ui_util.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 "grit/browser_resources.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/chromeos/webui/login/login_ui.h b/chrome/browser/chromeos/webui/login/login_ui.h index 10b5bf4..094692a 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/dom_ui/chrome_url_data_manager.h" -#include "chrome/browser/dom_ui/web_ui.h" +#include "chrome/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 0f49ac2..7ed1f4a 100644 --- a/chrome/browser/chromeos/webui/menu_ui.cc +++ b/chrome/browser/chromeos/webui/menu_ui.cc @@ -19,13 +19,13 @@ #include "chrome/browser/browser_thread.h" #include "chrome/browser/chromeos/views/native_menu_webui.h" #include "chrome/browser/chromeos/views/webui_menu_widget.h" -#include "chrome/browser/dom_ui/web_ui_util.h" #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/common/url_constants.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 "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 b913805..0cf8be5 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/dom_ui/chrome_url_data_manager.h" -#include "chrome/browser/dom_ui/web_ui.h" +#include "chrome/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 a9bfb8b..fb00b23 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/dom_ui/web_ui.h" +#include "chrome/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 7b47127..fdad943 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/dom_ui/web_ui.h" +#include "chrome/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 cfcfe97..68da264 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/dom_ui/web_ui.h" +#include "chrome/browser/webui/web_ui.h" class SystemInfoUI : public WebUI { public: diff --git a/chrome/browser/dom_ui/app_launcher_handler.h b/chrome/browser/dom_ui/app_launcher_handler.h index acb7753..f117786 100644 --- a/chrome/browser/dom_ui/app_launcher_handler.h +++ b/chrome/browser/dom_ui/app_launcher_handler.h @@ -7,9 +7,9 @@ #pragma once #include "base/scoped_ptr.h" -#include "chrome/browser/dom_ui/web_ui.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" diff --git a/chrome/browser/dom_ui/constrained_html_ui.cc b/chrome/browser/dom_ui/constrained_html_ui.cc index 5eac45d..494199f 100644 --- a/chrome/browser/dom_ui/constrained_html_ui.cc +++ b/chrome/browser/dom_ui/constrained_html_ui.cc @@ -6,9 +6,9 @@ #include "base/lazy_instance.h" #include "chrome/browser/dom_ui/html_dialog_ui.h" -#include "chrome/browser/dom_ui/web_ui_util.h" -#include "chrome/browser/tab_contents/tab_contents.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" static base::LazyInstance<PropertyAccessor<ConstrainedHtmlUIDelegate*> > diff --git a/chrome/browser/dom_ui/constrained_html_ui.h b/chrome/browser/dom_ui/constrained_html_ui.h index f2ca192..2b12560 100644 --- a/chrome/browser/dom_ui/constrained_html_ui.h +++ b/chrome/browser/dom_ui/constrained_html_ui.h @@ -8,8 +8,8 @@ #include <vector> -#include "chrome/browser/dom_ui/web_ui.h" #include "chrome/browser/tab_contents/constrained_window.h" +#include "chrome/browser/webui/web_ui.h" #include "chrome/common/property_bag.h" class HtmlDialogUIDelegate; diff --git a/chrome/browser/dom_ui/downloads_dom_handler.h b/chrome/browser/dom_ui/downloads_dom_handler.h index 2e5b3fc..f6ffca4 100644 --- a/chrome/browser/dom_ui/downloads_dom_handler.h +++ b/chrome/browser/dom_ui/downloads_dom_handler.h @@ -9,9 +9,9 @@ #include <vector> #include "base/scoped_callback_factory.h" -#include "chrome/browser/dom_ui/web_ui.h" #include "chrome/browser/download/download_item.h" #include "chrome/browser/download/download_manager.h" +#include "chrome/browser/webui/web_ui.h" class ListValue; diff --git a/chrome/browser/dom_ui/file_browse_browsertest.cc b/chrome/browser/dom_ui/file_browse_browsertest.cc index c77d87f..a580844 100644 --- a/chrome/browser/dom_ui/file_browse_browsertest.cc +++ b/chrome/browser/dom_ui/file_browse_browsertest.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 "base/task.h" #include "base/path_service.h" -#include "chrome/browser/dom_ui/web_ui.h" +#include "base/task.h" #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" diff --git a/chrome/browser/dom_ui/foreign_session_handler.h b/chrome/browser/dom_ui/foreign_session_handler.h index c1cb9f4..fa048ee 100644 --- a/chrome/browser/dom_ui/foreign_session_handler.h +++ b/chrome/browser/dom_ui/foreign_session_handler.h @@ -8,9 +8,9 @@ #include <vector> -#include "chrome/browser/dom_ui/web_ui.h" #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" diff --git a/chrome/browser/dom_ui/generic_handler.h b/chrome/browser/dom_ui/generic_handler.h index 3e7b7c5..b757e84 100644 --- a/chrome/browser/dom_ui/generic_handler.h +++ b/chrome/browser/dom_ui/generic_handler.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_DOM_UI_GENERIC_HANDLER_H_ #pragma once -#include "chrome/browser/dom_ui/web_ui.h" +#include "chrome/browser/webui/web_ui.h" class ListValue; diff --git a/chrome/browser/dom_ui/html_dialog_ui.cc b/chrome/browser/dom_ui/html_dialog_ui.cc index afe66e8..427ea5e 100644 --- a/chrome/browser/dom_ui/html_dialog_ui.cc +++ b/chrome/browser/dom_ui/html_dialog_ui.cc @@ -7,9 +7,9 @@ #include "base/callback.h" #include "base/lazy_instance.h" #include "base/values.h" -#include "chrome/browser/dom_ui/web_ui_util.h" -#include "chrome/browser/tab_contents/tab_contents.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" static base::LazyInstance<PropertyAccessor<HtmlDialogUIDelegate*> > diff --git a/chrome/browser/dom_ui/html_dialog_ui.h b/chrome/browser/dom_ui/html_dialog_ui.h index d682fa2..65c7e6c 100644 --- a/chrome/browser/dom_ui/html_dialog_ui.h +++ b/chrome/browser/dom_ui/html_dialog_ui.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "chrome/browser/dom_ui/web_ui.h" +#include "chrome/browser/webui/web_ui.h" #include "chrome/common/property_bag.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/dom_ui/mediaplayer_ui.h b/chrome/browser/dom_ui/mediaplayer_ui.h index c304954..0c6fcc3 100644 --- a/chrome/browser/dom_ui/mediaplayer_ui.h +++ b/chrome/browser/dom_ui/mediaplayer_ui.h @@ -10,11 +10,11 @@ #include <vector> #include "chrome/browser/dom_ui/chrome_url_data_manager.h" -#include "chrome/browser/dom_ui/web_ui.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 "chrome/common/notification_registrar.h" #include "net/base/directory_lister.h" #include "net/url_request/url_request.h" diff --git a/chrome/browser/dom_ui/most_visited_handler.h b/chrome/browser/dom_ui/most_visited_handler.h index 97a93dc..814d9e1 100644 --- a/chrome/browser/dom_ui/most_visited_handler.h +++ b/chrome/browser/dom_ui/most_visited_handler.h @@ -10,8 +10,8 @@ #include <vector> #include "chrome/browser/cancelable_request.h" -#include "chrome/browser/dom_ui/web_ui.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" diff --git a/chrome/browser/dom_ui/net_internals_ui.h b/chrome/browser/dom_ui/net_internals_ui.h index 36abca3..53af9ae 100644 --- a/chrome/browser/dom_ui/net_internals_ui.h +++ b/chrome/browser/dom_ui/net_internals_ui.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_DOM_UI_NET_INTERNALS_UI_H_ #pragma once -#include "chrome/browser/dom_ui/web_ui.h" +#include "chrome/browser/webui/web_ui.h" class NetInternalsUI : public WebUI { public: diff --git a/chrome/browser/dom_ui/new_tab_page_sync_handler.h b/chrome/browser/dom_ui/new_tab_page_sync_handler.h index f3e35a5..672ac54 100644 --- a/chrome/browser/dom_ui/new_tab_page_sync_handler.h +++ b/chrome/browser/dom_ui/new_tab_page_sync_handler.h @@ -8,9 +8,9 @@ #include <string> -#include "chrome/browser/dom_ui/web_ui.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/sync_ui_util.h" +#include "chrome/browser/webui/web_ui.h" class ListValue; diff --git a/chrome/browser/dom_ui/new_tab_ui.h b/chrome/browser/dom_ui/new_tab_ui.h index badc476..30acb50 100644 --- a/chrome/browser/dom_ui/new_tab_ui.h +++ b/chrome/browser/dom_ui/new_tab_ui.h @@ -11,8 +11,8 @@ #include "base/gtest_prod_util.h" #include "base/timer.h" #include "chrome/browser/dom_ui/chrome_url_data_manager.h" -#include "chrome/browser/dom_ui/web_ui.h" #include "chrome/browser/sessions/tab_restore_service.h" +#include "chrome/browser/webui/web_ui.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" diff --git a/chrome/browser/dom_ui/ntp_login_handler.cc b/chrome/browser/dom_ui/ntp_login_handler.cc index 52faf92c..468343d 100644 --- a/chrome/browser/dom_ui/ntp_login_handler.cc +++ b/chrome/browser/dom_ui/ntp_login_handler.cc @@ -7,14 +7,14 @@ #include <string> #include "base/values.h" -#include "chrome/browser/dom_ui/web_ui_util.h" #include "chrome/browser/prefs/pref_notifier.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/sync_setup_flow.h" -#include "chrome/common/pref_names.h" +#include "chrome/browser/webui/web_ui_util.h" #include "chrome/common/notification_details.h" +#include "chrome/common/pref_names.h" NTPLoginHandler::NTPLoginHandler() { } diff --git a/chrome/browser/dom_ui/ntp_login_handler.h b/chrome/browser/dom_ui/ntp_login_handler.h index 6b661cb..2213e2e 100644 --- a/chrome/browser/dom_ui/ntp_login_handler.h +++ b/chrome/browser/dom_ui/ntp_login_handler.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_DOM_UI_NTP_LOGIN_HANDLER_H_ #pragma once -#include "chrome/browser/dom_ui/web_ui.h" #include "chrome/browser/prefs/pref_member.h" +#include "chrome/browser/webui/web_ui.h" #include "chrome/common/notification_observer.h" // The NTP login handler currently simply displays the current logged in diff --git a/chrome/browser/dom_ui/options/autofill_options_handler.cc b/chrome/browser/dom_ui/options/autofill_options_handler.cc index 4ab22e4..32810c8 100644 --- a/chrome/browser/dom_ui/options/autofill_options_handler.cc +++ b/chrome/browser/dom_ui/options/autofill_options_handler.cc @@ -13,8 +13,8 @@ #include "base/values.h" #include "chrome/browser/autofill/autofill_profile.h" #include "chrome/browser/autofill/credit_card.h" -#include "chrome/browser/dom_ui/web_ui_util.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/webui/web_ui_util.h" #include "chrome/common/guid.h" #include "grit/generated_resources.h" #include "grit/webkit_resources.h" diff --git a/chrome/browser/dom_ui/options/options_managed_banner_handler.cc b/chrome/browser/dom_ui/options/options_managed_banner_handler.cc index e28a731..81d2ccc 100644 --- a/chrome/browser/dom_ui/options/options_managed_banner_handler.cc +++ b/chrome/browser/dom_ui/options/options_managed_banner_handler.cc @@ -6,8 +6,8 @@ #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/dom_ui/web_ui.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/webui/web_ui.h" OptionsManagedBannerHandler::OptionsManagedBannerHandler( WebUI* web_ui, const string16& page_name, OptionsPage page) diff --git a/chrome/browser/dom_ui/options/options_ui.h b/chrome/browser/dom_ui/options/options_ui.h index bcfd54e..74bf96a 100644 --- a/chrome/browser/dom_ui/options/options_ui.h +++ b/chrome/browser/dom_ui/options/options_ui.h @@ -10,7 +10,7 @@ #include "base/scoped_ptr.h" #include "chrome/browser/dom_ui/chrome_url_data_manager.h" -#include "chrome/browser/dom_ui/web_ui.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" diff --git a/chrome/browser/dom_ui/options/personal_options_handler.cc b/chrome/browser/dom_ui/options/personal_options_handler.cc index b489cf2..64968f2 100644 --- a/chrome/browser/dom_ui/options/personal_options_handler.cc +++ b/chrome/browser/dom_ui/options/personal_options_handler.cc @@ -36,7 +36,7 @@ #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/login/user_manager.h" -#include "chrome/browser/dom_ui/web_ui_util.h" +#include "chrome/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/dom_ui/plugins_ui.h b/chrome/browser/dom_ui/plugins_ui.h index 8ce0e62..787ef53 100644 --- a/chrome/browser/dom_ui/plugins_ui.h +++ b/chrome/browser/dom_ui/plugins_ui.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_DOM_UI_PLUGINS_UI_H_ #pragma once -#include "chrome/browser/dom_ui/web_ui.h" +#include "chrome/browser/webui/web_ui.h" class PrefService; class RefCountedMemory; diff --git a/chrome/browser/dom_ui/print_preview_handler.h b/chrome/browser/dom_ui/print_preview_handler.h index f692ba7..ad2751d 100644 --- a/chrome/browser/dom_ui/print_preview_handler.h +++ b/chrome/browser/dom_ui/print_preview_handler.h @@ -8,7 +8,7 @@ #include "base/ref_counted.h" #include "base/weak_ptr.h" -#include "chrome/browser/dom_ui/web_ui.h" +#include "chrome/browser/webui/web_ui.h" namespace printing { class PrintBackend; diff --git a/chrome/browser/dom_ui/print_preview_ui.h b/chrome/browser/dom_ui/print_preview_ui.h index 8367695..7900b6e 100644 --- a/chrome/browser/dom_ui/print_preview_ui.h +++ b/chrome/browser/dom_ui/print_preview_ui.h @@ -7,7 +7,7 @@ #pragma once #include "base/ref_counted.h" -#include "chrome/browser/dom_ui/web_ui.h" +#include "chrome/browser/webui/web_ui.h" class PrintPreviewUIHTMLSource; diff --git a/chrome/browser/dom_ui/remoting_ui.h b/chrome/browser/dom_ui/remoting_ui.h index 9c25513..4da8f30 100644 --- a/chrome/browser/dom_ui/remoting_ui.h +++ b/chrome/browser/dom_ui/remoting_ui.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_DOM_UI_REMOTING_UI_H_ #pragma once -#include "chrome/browser/dom_ui/web_ui.h" +#include "chrome/browser/webui/web_ui.h" class PrefService; class RefCountedMemory; diff --git a/chrome/browser/dom_ui/shown_sections_handler.h b/chrome/browser/dom_ui/shown_sections_handler.h index 5fa0776..3eb75ee 100644 --- a/chrome/browser/dom_ui/shown_sections_handler.h +++ b/chrome/browser/dom_ui/shown_sections_handler.h @@ -6,9 +6,9 @@ #define CHROME_BROWSER_DOM_UI_SHOWN_SECTIONS_HANDLER_H_ #pragma once -#include "chrome/browser/dom_ui/web_ui.h" -#include "chrome/common/notification_observer.h" #include "chrome/browser/prefs/pref_change_registrar.h" +#include "chrome/browser/webui/web_ui.h" +#include "chrome/common/notification_observer.h" class Extension; class Value; diff --git a/chrome/browser/dom_ui/slideshow_ui.h b/chrome/browser/dom_ui/slideshow_ui.h index c5a90b3..88740ac 100644 --- a/chrome/browser/dom_ui/slideshow_ui.h +++ b/chrome/browser/dom_ui/slideshow_ui.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_DOM_UI_SLIDESHOW_UI_H_ #pragma once -#include "chrome/browser/dom_ui/web_ui.h" +#include "chrome/browser/webui/web_ui.h" class SlideshowUI : public WebUI { public: diff --git a/chrome/browser/dom_ui/sync_internals_ui.h b/chrome/browser/dom_ui/sync_internals_ui.h index 2a1e8e4..5060426 100644 --- a/chrome/browser/dom_ui/sync_internals_ui.h +++ b/chrome/browser/dom_ui/sync_internals_ui.h @@ -9,8 +9,8 @@ #include <string> #include "base/basictypes.h" -#include "chrome/browser/dom_ui/web_ui.h" #include "chrome/browser/sync/js_event_handler.h" +#include "chrome/browser/webui/web_ui.h" namespace browser_sync { class JsFrontend; diff --git a/chrome/browser/dom_ui/textfields_ui.h b/chrome/browser/dom_ui/textfields_ui.h index 9ec2828..647aca5 100644 --- a/chrome/browser/dom_ui/textfields_ui.h +++ b/chrome/browser/dom_ui/textfields_ui.h @@ -9,7 +9,7 @@ #include <string> #include "chrome/browser/dom_ui/chrome_url_data_manager.h" -#include "chrome/browser/dom_ui/web_ui.h" +#include "chrome/browser/webui/web_ui.h" class RefCountedMemory; diff --git a/chrome/browser/dom_ui/tips_handler.h b/chrome/browser/dom_ui/tips_handler.h index 2890054..1a2cccf 100644 --- a/chrome/browser/dom_ui/tips_handler.h +++ b/chrome/browser/dom_ui/tips_handler.h @@ -12,7 +12,7 @@ #include <string> -#include "chrome/browser/dom_ui/web_ui.h" +#include "chrome/browser/webui/web_ui.h" class DictionaryValue; class ListValue; diff --git a/chrome/browser/dom_ui/web_ui_handler_browsertest.h b/chrome/browser/dom_ui/web_ui_handler_browsertest.h index 771e7fd..36bae01 100644 --- a/chrome/browser/dom_ui/web_ui_handler_browsertest.h +++ b/chrome/browser/dom_ui/web_ui_handler_browsertest.h @@ -8,7 +8,7 @@ #include <string> -#include "chrome/browser/dom_ui/web_ui.h" +#include "chrome/browser/webui/web_ui.h" // This class registers test framework specific handlers on WebUI objects. class WebUIHandlerBrowserTest : public WebUIMessageHandler { diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc index 74ca032..669ad5c 100644 --- a/chrome/browser/extensions/extension_host.cc +++ b/chrome/browser/extensions/extension_host.cc @@ -7,8 +7,8 @@ #include <list> #include "base/message_loop.h" -#include "base/singleton.h" #include "base/metrics/histogram.h" +#include "base/singleton.h" #include "base/string_util.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_shutdown.h" @@ -16,10 +16,9 @@ #include "chrome/browser/browsing_instance.h" #include "chrome/browser/debugger/devtools_manager.h" #include "chrome/browser/desktop_notification_handler.h" -#include "chrome/browser/dom_ui/web_ui_factory.h" #include "chrome/browser/extensions/extension_message_service.h" -#include "chrome/browser/extensions/extension_tabs_module.h" #include "chrome/browser/extensions/extension_service.h" +#include "chrome/browser/extensions/extension_tabs_module.h" #include "chrome/browser/file_select_helper.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/profiles/profile.h" @@ -35,6 +34,7 @@ #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" diff --git a/chrome/browser/extensions/extension_web_ui.h b/chrome/browser/extensions/extension_web_ui.h index 50c2a61..343eb58 100644 --- a/chrome/browser/extensions/extension_web_ui.h +++ b/chrome/browser/extensions/extension_web_ui.h @@ -9,10 +9,10 @@ #include <string> #include "base/scoped_ptr.h" -#include "chrome/browser/dom_ui/web_ui.h" #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" class GURL; diff --git a/chrome/browser/extensions/extensions_ui.h b/chrome/browser/extensions/extensions_ui.h index 94d8afd..eb75441 100644 --- a/chrome/browser/extensions/extensions_ui.h +++ b/chrome/browser/extensions/extensions_ui.h @@ -11,10 +11,10 @@ #include "base/scoped_ptr.h" #include "chrome/browser/dom_ui/chrome_url_data_manager.h" -#include "chrome/browser/dom_ui/web_ui.h" #include "chrome/browser/extensions/extension_install_ui.h" #include "chrome/browser/extensions/pack_extension_job.h" #include "chrome/browser/ui/shell_dialogs.h" +#include "chrome/browser/webui/web_ui.h" #include "chrome/common/extensions/extension_resource.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" diff --git a/chrome/browser/favicon_service.cc b/chrome/browser/favicon_service.cc index f977119..9dbb010 100644 --- a/chrome/browser/favicon_service.cc +++ b/chrome/browser/favicon_service.cc @@ -4,10 +4,10 @@ #include "chrome/browser/favicon_service.h" -#include "chrome/browser/dom_ui/web_ui_factory.h" #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" 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 a290c96..6fe624e 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc @@ -12,7 +12,6 @@ #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/dom_ui/chrome_url_data_manager.h" -#include "chrome/browser/dom_ui/web_ui_util.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" @@ -27,6 +26,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/webui/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" 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 fb933e7..f331461 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 @@ -4,11 +4,11 @@ #include "chrome/browser/printing/cloud_print/cloud_print_setup_message_handler.h" -#include "base/scoped_ptr.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" -#include "chrome/browser/dom_ui/web_ui_util.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" 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 5869ff7..d25595c 100644 --- a/chrome/browser/printing/print_dialog_cloud.cc +++ b/chrome/browser/printing/print_dialog_cloud.cc @@ -12,8 +12,6 @@ #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/debugger/devtools_manager.h" -#include "chrome/browser/dom_ui/web_ui.h" -#include "chrome/browser/dom_ui/web_ui_util.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/printing/cloud_print/cloud_print_url.h" #include "chrome/browser/profiles/profile.h" @@ -22,6 +20,8 @@ #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" diff --git a/chrome/browser/printing/print_dialog_cloud_internal.h b/chrome/browser/printing/print_dialog_cloud_internal.h index 927bf2a..6427f3c 100644 --- a/chrome/browser/printing/print_dialog_cloud_internal.h +++ b/chrome/browser/printing/print_dialog_cloud_internal.h @@ -13,7 +13,7 @@ #include "base/scoped_ptr.h" #include "base/synchronization/lock.h" #include "chrome/browser/dom_ui/html_dialog_ui.h" -#include "chrome/browser/dom_ui/web_ui.h" +#include "chrome/browser/webui/web_ui.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" diff --git a/chrome/browser/remoting/remoting_options_handler.cc b/chrome/browser/remoting/remoting_options_handler.cc index 02ebac6..62ce92b 100644 --- a/chrome/browser/remoting/remoting_options_handler.cc +++ b/chrome/browser/remoting/remoting_options_handler.cc @@ -6,9 +6,9 @@ #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/common/remoting/chromoting_host_info.h" -#include "chrome/browser/dom_ui/web_ui.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 "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 b8a7de6..970072a 100644 --- a/chrome/browser/remoting/setup_flow.h +++ b/chrome/browser/remoting/setup_flow.h @@ -8,7 +8,7 @@ #include "base/callback.h" #include "base/scoped_ptr.h" #include "chrome/browser/dom_ui/html_dialog_ui.h" -#include "chrome/browser/dom_ui/web_ui.h" +#include "chrome/browser/webui/web_ui.h" #include "chrome/common/remoting/chromoting_host_info.h" class ListValue; diff --git a/chrome/browser/remoting/setup_flow_login_step.cc b/chrome/browser/remoting/setup_flow_login_step.cc index 6170198..5cfc08f 100644 --- a/chrome/browser/remoting/setup_flow_login_step.cc +++ b/chrome/browser/remoting/setup_flow_login_step.cc @@ -9,9 +9,9 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/dom_ui/web_ui_util.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" diff --git a/chrome/browser/renderer_host/site_instance.cc b/chrome/browser/renderer_host/site_instance.cc index 76d33fb..ef722b2 100644 --- a/chrome/browser/renderer_host/site_instance.cc +++ b/chrome/browser/renderer_host/site_instance.cc @@ -5,11 +5,11 @@ #include "chrome/browser/renderer_host/site_instance.h" #include "chrome/browser/browsing_instance.h" -#include "chrome/browser/dom_ui/web_ui_factory.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/renderer_host/browser_render_process_host.h" -#include "chrome/common/url_constants.h" +#include "chrome/browser/webui/web_ui_factory.h" #include "chrome/common/notification_service.h" +#include "chrome/common/url_constants.h" #include "net/base/registry_controlled_domain.h" // We treat javascript:, about:crash, about:hang, and about:shorthang as the diff --git a/chrome/browser/sync/sync_setup_flow.cc b/chrome/browser/sync/sync_setup_flow.cc index f215e1a..c5c2ec6 100644 --- a/chrome/browser/sync/sync_setup_flow.cc +++ b/chrome/browser/sync/sync_setup_flow.cc @@ -11,7 +11,6 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/dom_ui/web_ui_util.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" @@ -21,6 +20,7 @@ #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 "grit/locale_settings.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 d112af9..320a3d0 100644 --- a/chrome/browser/tab_contents/render_view_host_delegate_helper.h +++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.h @@ -9,7 +9,7 @@ #include <map> #include "base/basictypes.h" -#include "chrome/browser/dom_ui/web_ui_factory.h" +#include "chrome/browser/webui/web_ui_factory.h" #include "chrome/common/window_container_type.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h" #include "ui/gfx/rect.h" diff --git a/chrome/browser/tab_contents/render_view_host_manager.cc b/chrome/browser/tab_contents/render_view_host_manager.cc index 7aaf5f3..55902d8 100644 --- a/chrome/browser/tab_contents/render_view_host_manager.cc +++ b/chrome/browser/tab_contents/render_view_host_manager.cc @@ -6,8 +6,6 @@ #include "base/command_line.h" #include "base/logging.h" -#include "chrome/browser/dom_ui/web_ui.h" -#include "chrome/browser/dom_ui/web_ui_factory.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_host/render_view_host.h" @@ -18,6 +16,8 @@ #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents_view.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" diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index 55d8c83..62666c9 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -26,7 +26,6 @@ #include "chrome/browser/defaults.h" #include "chrome/browser/desktop_notification_handler.h" #include "chrome/browser/dom_operation_notification_details.h" -#include "chrome/browser/dom_ui/web_ui.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/download/download_request_limiter.h" @@ -77,6 +76,7 @@ #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" diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h index 9c40213..dcadb15 100644 --- a/chrome/browser/tab_contents/tab_contents.h +++ b/chrome/browser/tab_contents/tab_contents.h @@ -15,7 +15,6 @@ #include "base/gtest_prod_util.h" #include "base/scoped_ptr.h" #include "base/string16.h" -#include "chrome/browser/dom_ui/web_ui_factory.h" #include "chrome/browser/download/save_package.h" #include "chrome/browser/extensions/image_loading_tracker.h" #include "chrome/browser/fav_icon_helper.h" @@ -29,6 +28,7 @@ #include "chrome/browser/tab_contents/render_view_host_manager.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" 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 0cd6164..02a8fbc 100644 --- a/chrome/browser/ui/cocoa/html_dialog_window_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/html_dialog_window_controller_unittest.mm @@ -11,10 +11,10 @@ #import "base/mac/scoped_nsautorelease_pool.h" #include "base/sys_string_conversions.h" -#include "chrome/browser/dom_ui/web_ui.h" #include "chrome/browser/dom_ui/html_dialog_ui.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" +#include "chrome/browser/webui/web_ui.h" #include "chrome/test/browser_with_test_window_test.h" #include "chrome/test/testing_profile.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/webui/bookmarks_ui.h b/chrome/browser/webui/bookmarks_ui.h index 5cf1970..3968166 100644 --- a/chrome/browser/webui/bookmarks_ui.h +++ b/chrome/browser/webui/bookmarks_ui.h @@ -9,7 +9,7 @@ #include <string> #include "chrome/browser/dom_ui/chrome_url_data_manager.h" -#include "chrome/browser/dom_ui/web_ui.h" +#include "chrome/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 ec8665a..0772769 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/dom_ui/web_ui.h" +#include "chrome/browser/webui/web_ui.h" #if defined(OS_WIN) diff --git a/chrome/browser/webui/devtools_ui.h b/chrome/browser/webui/devtools_ui.h index ebaddf7..4ad495f 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/dom_ui/web_ui.h" +#include "chrome/browser/webui/web_ui.h" class DevToolsUI : public WebUI { public: diff --git a/chrome/browser/webui/downloads_ui.h b/chrome/browser/webui/downloads_ui.h index 73bd79d..252807c 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/dom_ui/web_ui.h" +#include "chrome/browser/webui/web_ui.h" class RefCountedMemory; diff --git a/chrome/browser/webui/flags_ui.h b/chrome/browser/webui/flags_ui.h index 53c7f3a..8b19f8c 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/dom_ui/web_ui.h" +#include "chrome/browser/webui/web_ui.h" class PrefService; class RefCountedMemory; diff --git a/chrome/browser/webui/gpu_internals_ui.h b/chrome/browser/webui/gpu_internals_ui.h index f5884832..0648bc1 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/dom_ui/web_ui.h" +#include "chrome/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 5aa280a..cca93f0 100644 --- a/chrome/browser/webui/history2_ui.h +++ b/chrome/browser/webui/history2_ui.h @@ -11,8 +11,8 @@ #include "base/string16.h" #include "chrome/browser/cancelable_request.h" #include "chrome/browser/dom_ui/chrome_url_data_manager.h" -#include "chrome/browser/dom_ui/web_ui.h" #include "chrome/browser/history/history.h" +#include "chrome/browser/webui/web_ui.h" #include "chrome/common/notification_registrar.h" class GURL; diff --git a/chrome/browser/webui/history_ui.h b/chrome/browser/webui/history_ui.h index 5d84706..5cfbe9f 100644 --- a/chrome/browser/webui/history_ui.h +++ b/chrome/browser/webui/history_ui.h @@ -11,8 +11,8 @@ #include "base/string16.h" #include "chrome/browser/cancelable_request.h" #include "chrome/browser/dom_ui/chrome_url_data_manager.h" -#include "chrome/browser/dom_ui/web_ui.h" #include "chrome/browser/history/history.h" +#include "chrome/browser/webui/web_ui.h" #include "chrome/common/notification_registrar.h" class GURL; diff --git a/chrome/browser/webui/keyboard_ui.h b/chrome/browser/webui/keyboard_ui.h index c0e7b52..7373a8f 100644 --- a/chrome/browser/webui/keyboard_ui.h +++ b/chrome/browser/webui/keyboard_ui.h @@ -9,7 +9,7 @@ #include <string> #include "chrome/browser/dom_ui/chrome_url_data_manager.h" -#include "chrome/browser/dom_ui/web_ui.h" +#include "chrome/browser/webui/web_ui.h" class Profile; diff --git a/chrome/browser/dom_ui/web_ui.cc b/chrome/browser/webui/web_ui.cc index ba11fbf..531f972 100644 --- a/chrome/browser/dom_ui/web_ui.cc +++ b/chrome/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/dom_ui/web_ui.h" +#include "chrome/browser/webui/web_ui.h" #include "base/i18n/rtl.h" #include "base/json/json_writer.h" diff --git a/chrome/browser/dom_ui/web_ui.h b/chrome/browser/webui/web_ui.h index 1e680fc..1944e3b 100644 --- a/chrome/browser/dom_ui/web_ui.h +++ b/chrome/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_DOM_UI_WEB_UI_H_ -#define CHROME_BROWSER_DOM_UI_WEB_UI_H_ +#ifndef CHROME_BROWSER_WEBUI_WEB_UI_H_ +#define CHROME_BROWSER_WEBUI_WEB_UI_H_ #pragma once #include <map> @@ -218,4 +218,4 @@ class WebUIMessageHandler { DISALLOW_COPY_AND_ASSIGN(WebUIMessageHandler); }; -#endif // CHROME_BROWSER_DOM_UI_WEB_UI_H_ +#endif // CHROME_BROWSER_WEBUI_WEB_UI_H_ diff --git a/chrome/browser/dom_ui/web_ui_factory.cc b/chrome/browser/webui/web_ui_factory.cc index 6cedb8c..0d050b7 100644 --- a/chrome/browser/dom_ui/web_ui_factory.cc +++ b/chrome/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/dom_ui/web_ui_factory.h" +#include "chrome/browser/webui/web_ui_factory.h" #include "base/command_line.h" #include "chrome/browser/about_flags.h" diff --git a/chrome/browser/dom_ui/web_ui_factory.h b/chrome/browser/webui/web_ui_factory.h index 08b3a2f..9f70871 100644 --- a/chrome/browser/dom_ui/web_ui_factory.h +++ b/chrome/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_DOM_UI_WEB_UI_FACTORY_H_ -#define CHROME_BROWSER_DOM_UI_WEB_UI_FACTORY_H_ +#ifndef CHROME_BROWSER_WEBUI_WEB_UI_FACTORY_H_ +#define CHROME_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_DOM_UI_WEB_UI_FACTORY_H_ +#endif // CHROME_BROWSER_WEBUI_WEB_UI_FACTORY_H_ diff --git a/chrome/browser/dom_ui/web_ui_unittest.cc b/chrome/browser/webui/web_ui_unittest.cc index c0ccc1c..c0ccc1c 100644 --- a/chrome/browser/dom_ui/web_ui_unittest.cc +++ b/chrome/browser/webui/web_ui_unittest.cc diff --git a/chrome/browser/dom_ui/web_ui_util.cc b/chrome/browser/webui/web_ui_util.cc index 2c95191..09fd1de 100644 --- a/chrome/browser/dom_ui/web_ui_util.cc +++ b/chrome/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/dom_ui/web_ui_util.h" +#include "chrome/browser/webui/web_ui_util.h" #include <vector> diff --git a/chrome/browser/dom_ui/web_ui_util.h b/chrome/browser/webui/web_ui_util.h index 3f13362..fec80e7 100644 --- a/chrome/browser/dom_ui/web_ui_util.h +++ b/chrome/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_DOM_UI_WEB_UI_UTIL_H_ -#define CHROME_BROWSER_DOM_UI_WEB_UI_UTIL_H_ +#ifndef CHROME_BROWSER_WEBUI_WEB_UI_UTIL_H_ +#define CHROME_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_DOM_UI_WEB_UI_UTIL_H_ +#endif // CHROME_BROWSER_WEBUI_WEB_UI_UTIL_H_ diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index ab595169..f12073e 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -967,10 +967,6 @@ 'browser/dom_ui/tips_handler.h', 'browser/dom_ui/value_helper.cc', 'browser/dom_ui/value_helper.h', - 'browser/dom_ui/web_ui.cc', - 'browser/dom_ui/web_ui.h', - 'browser/dom_ui/web_ui_factory.cc', - 'browser/dom_ui/web_ui_factory.h', 'browser/dom_ui/web_ui_favicon_source.cc', 'browser/dom_ui/web_ui_favicon_source.h', 'browser/dom_ui/web_ui_screenshot_source.cc', @@ -979,8 +975,6 @@ 'browser/dom_ui/web_ui_theme_source.h', 'browser/dom_ui/web_ui_thumbnail_source.cc', 'browser/dom_ui/web_ui_thumbnail_source.h', - 'browser/dom_ui/web_ui_util.cc', - 'browser/dom_ui/web_ui_util.h', 'browser/download/base_file.cc', 'browser/download/base_file.h', 'browser/download/download_extensions.cc', @@ -3589,6 +3583,12 @@ 'browser/webui/history_ui.h', 'browser/webui/keyboard_ui.cc', 'browser/webui/keyboard_ui.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 c1e930d..8c7545b 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1256,7 +1256,6 @@ 'browser/cookies_tree_model_unittest.cc', 'browser/debugger/devtools_manager_unittest.cc', 'browser/device_orientation/provider_unittest.cc', - 'browser/dom_ui/web_ui_unittest.cc', 'browser/dom_ui/html_dialog_tab_contents_delegate_unittest.cc', 'browser/dom_ui/options/language_options_handler_unittest.cc', 'browser/dom_ui/print_preview_ui_html_source_unittest.cc', @@ -1747,6 +1746,7 @@ 'browser/webdata/web_data_service_test_util.h', 'browser/webdata/web_data_service_unittest.cc', 'browser/webdata/web_database_unittest.cc', + 'browser/webui/web_ui_unittest.cc', 'browser/web_resource/web_resource_service_unittest.cc', 'common/bzip2_unittest.cc', 'common/child_process_logging_mac_unittest.mm', |