diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-06 23:44:20 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-06 23:44:20 +0000 |
| commit | 21e6caf8cb734cad565e8e23298edaf29f2aaaf0 (patch) | |
| tree | d89b7456490e2c4f1b44b18588911f6e84c00913 /chrome/browser/ui/webui | |
| parent | acb4f32800336c703c40c9ed6c50138e56ec57e1 (diff) | |
| download | chromium_src-21e6caf8cb734cad565e8e23298edaf29f2aaaf0.zip chromium_src-21e6caf8cb734cad565e8e23298edaf29f2aaaf0.tar.gz chromium_src-21e6caf8cb734cad565e8e23298edaf29f2aaaf0.tar.bz2 | |
Get rid of the ChromeWebUI class and just make all the classes in chrome derive directly from WebUI. I've left the header behind since it now just contains the static functions for MoreWebUI.
BUG=98716
Review URL: http://codereview.chromium.org/9122011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116773 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui')
88 files changed, 174 insertions, 195 deletions
diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc index b6fec8d..24b4752 100644 --- a/chrome/browser/ui/webui/about_ui.cc +++ b/chrome/browser/ui/webui/about_ui.cc @@ -1379,7 +1379,7 @@ std::string AboutUIHTMLSource::GetMimeType(const std::string& path) const { } AboutUI::AboutUI(WebContents* contents, const std::string& name) - : ChromeWebUI(contents) { + : WebUI(contents) { Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext()); ChromeURLDataManager::DataSource* source = new AboutUIHTMLSource(name, profile); diff --git a/chrome/browser/ui/webui/about_ui.h b/chrome/browser/ui/webui/about_ui.h index f8a02e8..b02e105 100644 --- a/chrome/browser/ui/webui/about_ui.h +++ b/chrome/browser/ui/webui/about_ui.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" class Profile; class TabContents; @@ -43,7 +43,7 @@ class AboutUIHTMLSource : public ChromeURLDataManager::DataSource { DISALLOW_COPY_AND_ASSIGN(AboutUIHTMLSource); }; -class AboutUI : public ChromeWebUI { +class AboutUI : public WebUI { public: explicit AboutUI(content::WebContents* contents, const std::string& host); virtual ~AboutUI() {} diff --git a/chrome/browser/ui/webui/aura/app_list_ui.cc b/chrome/browser/ui/webui/aura/app_list_ui.cc index 1581f20..83fe930 100644 --- a/chrome/browser/ui/webui/aura/app_list_ui.cc +++ b/chrome/browser/ui/webui/aura/app_list_ui.cc @@ -120,7 +120,7 @@ void AppListHandler::HandleAppsLoaded(const base::ListValue* args) { } // namespace AppListUI::AppListUI(WebContents* contents) - : ChromeWebUI(contents), + : WebUI(contents), delegate_(NULL) { AddMessageHandler(new AppListHandler); diff --git a/chrome/browser/ui/webui/aura/app_list_ui.h b/chrome/browser/ui/webui/aura/app_list_ui.h index c548644..138ce67 100644 --- a/chrome/browser/ui/webui/aura/app_list_ui.h +++ b/chrome/browser/ui/webui/aura/app_list_ui.h @@ -6,11 +6,11 @@ #define CHROME_BROWSER_UI_WEBUI_AURA_APP_LIST_UI_H_ #pragma once -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" class AppListUIDelegate; -class AppListUI : public ChromeWebUI { +class AppListUI : public WebUI { public: explicit AppListUI(content::WebContents* contents); diff --git a/chrome/browser/ui/webui/bookmarks_ui.cc b/chrome/browser/ui/webui/bookmarks_ui.cc index c74ef49..e7ddc5c 100644 --- a/chrome/browser/ui/webui/bookmarks_ui.cc +++ b/chrome/browser/ui/webui/bookmarks_ui.cc @@ -56,7 +56,7 @@ std::string BookmarksUIHTMLSource::GetMimeType(const std::string& path) const { // //////////////////////////////////////////////////////////////////////////////// -BookmarksUI::BookmarksUI(WebContents* contents) : ChromeWebUI(contents) { +BookmarksUI::BookmarksUI(WebContents* contents) : WebUI(contents) { BookmarksUIHTMLSource* html_source = new BookmarksUIHTMLSource(); // Set up the chrome://bookmarks/ source. diff --git a/chrome/browser/ui/webui/bookmarks_ui.h b/chrome/browser/ui/webui/bookmarks_ui.h index f38a5da..6c26f54 100644 --- a/chrome/browser/ui/webui/bookmarks_ui.h +++ b/chrome/browser/ui/webui/bookmarks_ui.h @@ -9,7 +9,7 @@ #include <string> #include "chrome/browser/ui/webui/chrome_url_data_manager.h" -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" class RefCountedMemory; @@ -31,7 +31,7 @@ class BookmarksUIHTMLSource : public ChromeURLDataManager::DataSource { // This class is used to hook up chrome://bookmarks/ which in turn gets // overridden by an extension. -class BookmarksUI : public ChromeWebUI { +class BookmarksUI : public WebUI { public: explicit BookmarksUI(content::WebContents* contents); diff --git a/chrome/browser/ui/webui/certificate_viewer_webui.cc b/chrome/browser/ui/webui/certificate_viewer_webui.cc index fdfb492..14ca628 100644 --- a/chrome/browser/ui/webui/certificate_viewer_webui.cc +++ b/chrome/browser/ui/webui/certificate_viewer_webui.cc @@ -51,7 +51,7 @@ void ShowCertificateViewer(gfx::NativeWindow parent, // TODO(rbyers): Decide whether to replace the GTK certificate viewier on // Linux with the WebUI version, and (either way) remove this IsMoreWebUI // check. - if (ChromeWebUI::IsMoreWebUI()) + if (chrome_web_ui::IsMoreWebUI()) CertificateViewerDialog::ShowDialog(parent, cert); else ShowNativeCertificateViewer(parent, cert); diff --git a/chrome/browser/ui/webui/chrome_web_ui.cc b/chrome/browser/ui/webui/chrome_web_ui.cc index 25919f8..80510e0 100644 --- a/chrome/browser/ui/webui/chrome_web_ui.cc +++ b/chrome/browser/ui/webui/chrome_web_ui.cc @@ -6,39 +6,27 @@ #include "base/command_line.h" #include "chrome/common/chrome_switches.h" -#include "content/browser/renderer_host/render_view_host.h" -#include "content/public/browser/web_contents.h" #if defined(TOOLKIT_VIEWS) #include "ui/views/widget/widget.h" #endif -using content::WebContents; - -namespace { +namespace chrome_web_ui { // If true, overrides IsMoreWebUI flag. -bool override_more_webui_ = false; - -} // namespace - -ChromeWebUI::ChromeWebUI(WebContents* contents) - : WebUI(contents) { -} +static bool g_override_more_webui = false; -ChromeWebUI::~ChromeWebUI() { -} - -// static -bool ChromeWebUI::IsMoreWebUI() { +bool IsMoreWebUI() { bool more_webui = CommandLine::ForCurrentProcess()->HasSwitch( - switches::kUseMoreWebUI) || override_more_webui_; + switches::kUseMoreWebUI) || g_override_more_webui; #if defined(TOOLKIT_VIEWS) more_webui |= views::Widget::IsPureViews(); #endif return more_webui; } -void ChromeWebUI::OverrideMoreWebUI(bool use_more_webui) { - override_more_webui_ = use_more_webui; +void OverrideMoreWebUI(bool use_more_webui) { + g_override_more_webui = use_more_webui; } + +} // namespace chrome_web_ui diff --git a/chrome/browser/ui/webui/chrome_web_ui.h b/chrome/browser/ui/webui/chrome_web_ui.h index 0d03b53..22fa031 100644 --- a/chrome/browser/ui/webui/chrome_web_ui.h +++ b/chrome/browser/ui/webui/chrome_web_ui.h @@ -6,23 +6,16 @@ #define CHROME_BROWSER_UI_WEBUI_CHROME_WEB_UI_H_ #pragma once -#include "content/browser/webui/web_ui.h" +namespace chrome_web_ui { -class ChromeWebUI : public WebUI { - public: - explicit ChromeWebUI(content::WebContents* contents); - virtual ~ChromeWebUI(); +// IsMoreWebUI returns a command line flag that tracks whether to use +// available WebUI implementations of native dialogs. +bool IsMoreWebUI(); - // IsMoreWebUI returns a command line flag that tracks whether to use - // available WebUI implementations of native dialogs. - static bool IsMoreWebUI(); +// Override the argument setting for more WebUI. If true this enables more +// WebUI. +void OverrideMoreWebUI(bool use_more_webui); - // Override the argument setting for more WebUI. If true this enables more - // WebUI. - static void OverrideMoreWebUI(bool use_more_webui); - - private: - DISALLOW_COPY_AND_ASSIGN(ChromeWebUI); -}; +} // namespace chrome_web_ui #endif // CHROME_BROWSER_UI_WEBUI_CHROME_WEB_UI_H_ diff --git a/chrome/browser/ui/webui/chrome_web_ui_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_factory.cc index ea41505..6461c7e7 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_factory.cc @@ -88,24 +88,24 @@ namespace { // A function for creating a new WebUI. The caller owns the return value, which // may be NULL (for example, if the URL refers to an non-existent extension). -typedef ChromeWebUI* (*WebUIFactoryFunction)(TabContents* tab_contents, - const GURL& url); +typedef WebUI* (*WebUIFactoryFunction)(TabContents* tab_contents, + const GURL& url); // Template for defining WebUIFactoryFunction. template<class T> -ChromeWebUI* NewWebUI(TabContents* contents, const GURL& url) { +WebUI* NewWebUI(TabContents* contents, const GURL& url) { return new T(contents); } // Special case for extensions. template<> -ChromeWebUI* NewWebUI<ExtensionWebUI>(TabContents* contents, const GURL& url) { +WebUI* NewWebUI<ExtensionWebUI>(TabContents* contents, const GURL& url) { return new ExtensionWebUI(contents, url); } // Special case for older about: handlers. template<> -ChromeWebUI* NewWebUI<AboutUI>(TabContents* contents, const GURL& url) { +WebUI* NewWebUI<AboutUI>(TabContents* contents, const GURL& url) { return new AboutUI(contents, url.host()); } diff --git a/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc b/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc index 5dd019e..2fef4e4 100644 --- a/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc +++ b/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc @@ -211,7 +211,7 @@ void ChooseMobileNetworkHandler::HandlePageReady(const ListValue* args) { } // namespace ChooseMobileNetworkUI::ChooseMobileNetworkUI(WebContents* contents) - : ChromeWebUI(contents) { + : WebUI(contents) { ChooseMobileNetworkHandler* handler = new ChooseMobileNetworkHandler(); AddMessageHandler(handler); // Set up the "chrome://choose-mobile-network" source. diff --git a/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h b/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h index 666e2d3..217b65e 100644 --- a/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h +++ b/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h @@ -6,12 +6,12 @@ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_CHOOSE_MOBILE_NETWORK_UI_H_ #pragma once -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" namespace chromeos { // A custom WebUI that defines datasource for choosing cellular network dialog. -class ChooseMobileNetworkUI : public ChromeWebUI { +class ChooseMobileNetworkUI : public WebUI { public: explicit ChooseMobileNetworkUI(content::WebContents* contents); diff --git a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc index f2cd398..672dfd0 100644 --- a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc +++ b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc @@ -645,7 +645,7 @@ bool WebUIHandler::CheckNetwork() { // //////////////////////////////////////////////////////////////////////////////// -ImageBurnUI::ImageBurnUI(WebContents* contents) : ChromeWebUI(contents) { +ImageBurnUI::ImageBurnUI(WebContents* contents) : WebUI(contents) { imageburner::WebUIHandler* handler = new imageburner::WebUIHandler(contents); AddMessageHandler(handler); diff --git a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.h b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.h index 1a465c8..73d3f9a 100644 --- a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.h +++ b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.h @@ -5,9 +5,9 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_IMAGEBURNER_IMAGEBURNER_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_IMAGEBURNER_IMAGEBURNER_UI_H_ -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" -class ImageBurnUI : public ChromeWebUI { +class ImageBurnUI : public WebUI { public: explicit ImageBurnUI(content::WebContents* contents); diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc index 0062b2f..c7b8f67 100644 --- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc +++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc @@ -109,7 +109,7 @@ std::string OobeUIHTMLSource::GetDataResource(int resource_id) const { // OobeUI ---------------------------------------------------------------------- OobeUI::OobeUI(WebContents* contents) - : ChromeWebUI(contents), + : WebUI(contents), update_screen_actor_(NULL), network_screen_actor_(NULL), eula_screen_actor_(NULL), diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.h b/chrome/browser/ui/webui/chromeos/login/oobe_ui.h index 83b1388..5f3d0a6 100644 --- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.h +++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.h @@ -7,7 +7,7 @@ #pragma once #include "chrome/browser/chromeos/login/oobe_display.h" -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" namespace base { class DictionaryValue; @@ -27,7 +27,7 @@ namespace chromeos { // - eula screen (CrOS (+ OEM) EULA content/TPM password/crash reporting). // - update screen. class OobeUI : public OobeDisplay, - public ChromeWebUI { + public WebUI { public: explicit OobeUI(content::WebContents* contents); diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc index 35d7a10..59f3c21 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc @@ -1352,7 +1352,7 @@ void MobileSetupHandler::StartActivationOnUIThread() { // //////////////////////////////////////////////////////////////////////////////// -MobileSetupUI::MobileSetupUI(WebContents* contents) : ChromeWebUI(contents) { +MobileSetupUI::MobileSetupUI(WebContents* contents) : WebUI(contents) { chromeos::CellularNetwork* network = GetCellularNetwork(); std::string service_path = network ? network->service_path() : std::string(); MobileSetupHandler* handler = new MobileSetupHandler(service_path); @@ -1366,7 +1366,7 @@ MobileSetupUI::MobileSetupUI(WebContents* contents) : ChromeWebUI(contents) { } void MobileSetupUI::RenderViewCreated(RenderViewHost* host) { - ChromeWebUI::RenderViewCreated(host); + WebUI::RenderViewCreated(host); // Destroyed by the corresponding RenderViewHost. new PortalFrameLoadObserver(host, web_contents()->GetWebUI()); } diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.h b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.h index 9931298..4fd6fef 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.h +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.h @@ -6,16 +6,16 @@ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_MOBILE_SETUP_UI_H_ #pragma once -#include "chrome/browser/ui/webui/chrome_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. -class MobileSetupUI : public ChromeWebUI { +class MobileSetupUI : public WebUI { public: explicit MobileSetupUI(content::WebContents* contents); private: - // ChromeWebUI overrides. + // WebUI overrides. virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE; DISALLOW_COPY_AND_ASSIGN(MobileSetupUI); diff --git a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc index 82b2bfd..1d86f02 100644 --- a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc +++ b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc @@ -69,7 +69,7 @@ void ProxySettingsHTMLSource::StartDataRequest(const std::string& path, namespace chromeos { ProxySettingsUI::ProxySettingsUI(WebContents* contents) - : ChromeWebUI(contents), + : WebUI(contents), proxy_handler_(new ProxyHandler()) { // |localized_strings| will be owned by ProxySettingsHTMLSource. DictionaryValue* localized_strings = new DictionaryValue(); diff --git a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.h b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.h index bb6ab92..e2e3a0a 100644 --- a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.h +++ b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_PROXY_SETTINGS_UI_H_ #pragma once -#include "chrome/browser/ui/webui/chrome_web_ui.h" #include "chrome/browser/ui/webui/options/options_ui.h" +#include "content/browser/webui/web_ui.h" namespace chromeos { @@ -15,7 +15,7 @@ class ProxyHandler; // A WebUI to host proxy settings splitted from settings page for better // performance. -class ProxySettingsUI : public ChromeWebUI, +class ProxySettingsUI : public WebUI, public OptionsPageUIHandlerHost { public: explicit ProxySettingsUI(content::WebContents* contents); diff --git a/chrome/browser/ui/webui/chromeos/register_page_ui.cc b/chrome/browser/ui/webui/chromeos/register_page_ui.cc index 16f2fd4..2dfad53 100644 --- a/chrome/browser/ui/webui/chromeos/register_page_ui.cc +++ b/chrome/browser/ui/webui/chromeos/register_page_ui.cc @@ -294,7 +294,7 @@ void RegisterPageHandler::SendUserInfo() { // //////////////////////////////////////////////////////////////////////////////// -RegisterPageUI::RegisterPageUI(WebContents* contents) : ChromeWebUI(contents) { +RegisterPageUI::RegisterPageUI(WebContents* contents) : WebUI(contents) { RegisterPageHandler* handler = new RegisterPageHandler(); AddMessageHandler(handler); RegisterPageUIHTMLSource* html_source = new RegisterPageUIHTMLSource(); diff --git a/chrome/browser/ui/webui/chromeos/register_page_ui.h b/chrome/browser/ui/webui/chromeos/register_page_ui.h index 77ef595..6e53b93 100644 --- a/chrome/browser/ui/webui/chromeos/register_page_ui.h +++ b/chrome/browser/ui/webui/chromeos/register_page_ui.h @@ -6,11 +6,11 @@ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_REGISTER_PAGE_UI_H_ #pragma once -#include "chrome/browser/ui/webui/chrome_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. -class RegisterPageUI : public ChromeWebUI { +class RegisterPageUI : public WebUI { public: explicit RegisterPageUI(content::WebContents* contents); diff --git a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc index 5fffe31..37444c8 100644 --- a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc +++ b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc @@ -662,7 +662,7 @@ void SimUnlockHandler::UpdatePage(const chromeos::NetworkDevice* cellular, // SimUnlockUI ----------------------------------------------------------------- -SimUnlockUI::SimUnlockUI(WebContents* contents) : ChromeWebUI(contents) { +SimUnlockUI::SimUnlockUI(WebContents* contents) : WebUI(contents) { SimUnlockHandler* handler = new SimUnlockHandler(); AddMessageHandler(handler); SimUnlockUIHTMLSource* html_source = new SimUnlockUIHTMLSource(); diff --git a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.h b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.h index 3ae4686..0036e64 100644 --- a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.h +++ b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_SIM_UNLOCK_UI_H_ #pragma once -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" namespace chromeos { @@ -14,7 +14,7 @@ namespace chromeos { // in Chrome OS for specific tasks: // - Unlock SIM card (enter PIN/PUK codes). // - Display "SIM card is blocked" message when there're no PUK tries left. -class SimUnlockUI : public ChromeWebUI { +class SimUnlockUI : public WebUI { public: explicit SimUnlockUI(content::WebContents* contents); diff --git a/chrome/browser/ui/webui/chromeos/system_info_ui.cc b/chrome/browser/ui/webui/chromeos/system_info_ui.cc index 8159ca7..bf67039 100644 --- a/chrome/browser/ui/webui/chromeos/system_info_ui.cc +++ b/chrome/browser/ui/webui/chromeos/system_info_ui.cc @@ -172,7 +172,7 @@ void SystemInfoHandler::RegisterMessages() { // //////////////////////////////////////////////////////////////////////////////// -SystemInfoUI::SystemInfoUI(WebContents* contents) : ChromeWebUI(contents) { +SystemInfoUI::SystemInfoUI(WebContents* contents) : WebUI(contents) { SystemInfoHandler* handler = new SystemInfoHandler(); AddMessageHandler(handler); SystemInfoUIHTMLSource* html_source = new SystemInfoUIHTMLSource(); diff --git a/chrome/browser/ui/webui/chromeos/system_info_ui.h b/chrome/browser/ui/webui/chromeos/system_info_ui.h index a658a5d..192f718 100644 --- a/chrome/browser/ui/webui/chromeos/system_info_ui.h +++ b/chrome/browser/ui/webui/chromeos/system_info_ui.h @@ -6,9 +6,9 @@ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_SYSTEM_INFO_UI_H_ #pragma once -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" -class SystemInfoUI : public ChromeWebUI { +class SystemInfoUI : public WebUI { public: explicit SystemInfoUI(content::WebContents* contents); diff --git a/chrome/browser/ui/webui/conflicts_ui.cc b/chrome/browser/ui/webui/conflicts_ui.cc index c56e521..83e790e 100644 --- a/chrome/browser/ui/webui/conflicts_ui.cc +++ b/chrome/browser/ui/webui/conflicts_ui.cc @@ -159,7 +159,7 @@ void ConflictsDOMHandler::Observe(int type, // /////////////////////////////////////////////////////////////////////////////// -ConflictsUI::ConflictsUI(WebContents* contents) : ChromeWebUI(contents) { +ConflictsUI::ConflictsUI(WebContents* contents) : WebUI(contents) { content::RecordAction(UserMetricsAction("ViewAboutConflicts")); AddMessageHandler(new ConflictsDOMHandler()); diff --git a/chrome/browser/ui/webui/conflicts_ui.h b/chrome/browser/ui/webui/conflicts_ui.h index f53cfeb..f265f58 100644 --- a/chrome/browser/ui/webui/conflicts_ui.h +++ b/chrome/browser/ui/webui/conflicts_ui.h @@ -6,14 +6,14 @@ #define CHROME_BROWSER_UI_WEBUI_CONFLICTS_UI_H_ #pragma once -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" #if defined(OS_WIN) class RefCountedMemory; // The Web UI handler for about:conflicts. -class ConflictsUI : public ChromeWebUI { +class ConflictsUI : public WebUI { public: explicit ConflictsUI(content::WebContents* contents); diff --git a/chrome/browser/ui/webui/constrained_html_ui.cc b/chrome/browser/ui/webui/constrained_html_ui.cc index 15e3613..cc7c2ef 100644 --- a/chrome/browser/ui/webui/constrained_html_ui.cc +++ b/chrome/browser/ui/webui/constrained_html_ui.cc @@ -25,14 +25,14 @@ static base::LazyInstance<base::PropertyAccessor<ConstrainedHtmlUIDelegate*> > g_constrained_html_ui_property_accessor = LAZY_INSTANCE_INITIALIZER; ConstrainedHtmlUI::ConstrainedHtmlUI(WebContents* contents) - : ChromeWebUI(contents) { + : WebUI(contents) { } ConstrainedHtmlUI::~ConstrainedHtmlUI() { } void ConstrainedHtmlUI::RenderViewCreated(RenderViewHost* render_view_host) { - ChromeWebUI::RenderViewCreated(render_view_host); + WebUI::RenderViewCreated(render_view_host); ConstrainedHtmlUIDelegate* delegate = GetConstrainedDelegate(); if (!delegate) diff --git a/chrome/browser/ui/webui/constrained_html_ui.h b/chrome/browser/ui/webui/constrained_html_ui.h index bb059f1..a6d7d49 100644 --- a/chrome/browser/ui/webui/constrained_html_ui.h +++ b/chrome/browser/ui/webui/constrained_html_ui.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_CONSTRAINED_HTML_UI_H_ #pragma once -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" class ConstrainedWindow; class HtmlDialogUIDelegate; @@ -47,7 +47,7 @@ class ConstrainedHtmlUIDelegate { // // Since ConstrainedWindow requires platform-specific delegate // implementations, this class is just a factory stub. -class ConstrainedHtmlUI : public ChromeWebUI { +class ConstrainedHtmlUI : public WebUI { public: explicit ConstrainedHtmlUI(content::WebContents* contents); virtual ~ConstrainedHtmlUI(); diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/crashes_ui.cc index 2879ce2..813ec8b 100644 --- a/chrome/browser/ui/webui/crashes_ui.cc +++ b/chrome/browser/ui/webui/crashes_ui.cc @@ -159,7 +159,7 @@ void CrashesDOMHandler::UpdateUI() { // /////////////////////////////////////////////////////////////////////////////// -CrashesUI::CrashesUI(WebContents* contents) : ChromeWebUI(contents) { +CrashesUI::CrashesUI(WebContents* contents) : WebUI(contents) { AddMessageHandler(new CrashesDOMHandler()); // Set up the chrome://crashes/ source. diff --git a/chrome/browser/ui/webui/crashes_ui.h b/chrome/browser/ui/webui/crashes_ui.h index 0c2a4a4..2501a70 100644 --- a/chrome/browser/ui/webui/crashes_ui.h +++ b/chrome/browser/ui/webui/crashes_ui.h @@ -6,11 +6,11 @@ #define CHROME_BROWSER_UI_WEBUI_CRASHES_UI_H_ #pragma once -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" class RefCountedMemory; -class CrashesUI : public ChromeWebUI { +class CrashesUI : public WebUI { public: explicit CrashesUI(content::WebContents* contents); diff --git a/chrome/browser/ui/webui/devtools_ui.cc b/chrome/browser/ui/webui/devtools_ui.cc index d446936..d9d6229 100644 --- a/chrome/browser/ui/webui/devtools_ui.cc +++ b/chrome/browser/ui/webui/devtools_ui.cc @@ -100,7 +100,7 @@ void DevToolsUI::RegisterDevToolsDataSource(Profile* profile) { } } -DevToolsUI::DevToolsUI(WebContents* contents) : ChromeWebUI(contents) { +DevToolsUI::DevToolsUI(WebContents* contents) : WebUI(contents) { DevToolsDataSource* data_source = new DevToolsDataSource(); Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext()); profile->GetChromeURLDataManager()->AddDataSource(data_source); @@ -108,5 +108,5 @@ DevToolsUI::DevToolsUI(WebContents* contents) : ChromeWebUI(contents) { void DevToolsUI::RenderViewCreated(RenderViewHost* render_view_host) { content::DevToolsClientHost::SetupDevToolsFrontendClient(render_view_host); - ChromeWebUI::RenderViewCreated(render_view_host); + WebUI::RenderViewCreated(render_view_host); } diff --git a/chrome/browser/ui/webui/devtools_ui.h b/chrome/browser/ui/webui/devtools_ui.h index 3df724a..567b47a 100644 --- a/chrome/browser/ui/webui/devtools_ui.h +++ b/chrome/browser/ui/webui/devtools_ui.h @@ -6,11 +6,11 @@ #define CHROME_BROWSER_UI_WEBUI_DEVTOOLS_UI_H_ #pragma once -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" class Profile; -class DevToolsUI : public ChromeWebUI { +class DevToolsUI : public WebUI { public: static void RegisterDevToolsDataSource(Profile* profile); diff --git a/chrome/browser/ui/webui/downloads_ui.cc b/chrome/browser/ui/webui/downloads_ui.cc index 1a6ffc0..f930f7ab 100644 --- a/chrome/browser/ui/webui/downloads_ui.cc +++ b/chrome/browser/ui/webui/downloads_ui.cc @@ -84,7 +84,7 @@ ChromeWebUIDataSource* CreateDownloadsUIHTMLSource() { // /////////////////////////////////////////////////////////////////////////////// -DownloadsUI::DownloadsUI(WebContents* contents) : ChromeWebUI(contents) { +DownloadsUI::DownloadsUI(WebContents* contents) : WebUI(contents) { Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext()); DownloadManager* dlm = DownloadServiceFactory::GetForProfile(profile)->GetDownloadManager(); diff --git a/chrome/browser/ui/webui/downloads_ui.h b/chrome/browser/ui/webui/downloads_ui.h index 98e81ea..4ee9f1a 100644 --- a/chrome/browser/ui/webui/downloads_ui.h +++ b/chrome/browser/ui/webui/downloads_ui.h @@ -6,11 +6,11 @@ #define CHROME_BROWSER_UI_WEBUI_DOWNLOADS_UI_H_ #pragma once -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" class RefCountedMemory; -class DownloadsUI : public ChromeWebUI { +class DownloadsUI : public WebUI { public: explicit DownloadsUI(content::WebContents* contents); diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browser/ui/webui/extensions/extensions_ui.cc index 1a568be..1b5020a 100644 --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc @@ -30,7 +30,7 @@ ChromeWebUIDataSource* CreateExtensionsHTMLSource() { } // namespace -ExtensionsUI::ExtensionsUI(WebContents* contents) : ChromeWebUI(contents) { +ExtensionsUI::ExtensionsUI(WebContents* contents) : WebUI(contents) { Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext()); ChromeWebUIDataSource* source = CreateExtensionsHTMLSource(); profile->GetChromeURLDataManager()->AddDataSource(source); diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.h b/chrome/browser/ui/webui/extensions/extensions_ui.h index 2437f28..d5be20a 100644 --- a/chrome/browser/ui/webui/extensions/extensions_ui.h +++ b/chrome/browser/ui/webui/extensions/extensions_ui.h @@ -6,9 +6,9 @@ #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSIONS_UI_H_ #pragma once -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" -class ExtensionsUI : public ChromeWebUI { +class ExtensionsUI : public WebUI { public: explicit ExtensionsUI(content::WebContents* contents); virtual ~ExtensionsUI(); diff --git a/chrome/browser/ui/webui/flags_ui.cc b/chrome/browser/ui/webui/flags_ui.cc index 0e7dab4..f203602 100644 --- a/chrome/browser/ui/webui/flags_ui.cc +++ b/chrome/browser/ui/webui/flags_ui.cc @@ -159,7 +159,7 @@ void FlagsDOMHandler::HandleRestartBrowser(const ListValue* args) { // /////////////////////////////////////////////////////////////////////////////// -FlagsUI::FlagsUI(WebContents* contents) : ChromeWebUI(contents) { +FlagsUI::FlagsUI(WebContents* contents) : WebUI(contents) { AddMessageHandler(new FlagsDOMHandler()); // Set up the about:flags source. diff --git a/chrome/browser/ui/webui/flags_ui.h b/chrome/browser/ui/webui/flags_ui.h index 705a398..b559568 100644 --- a/chrome/browser/ui/webui/flags_ui.h +++ b/chrome/browser/ui/webui/flags_ui.h @@ -6,12 +6,12 @@ #define CHROME_BROWSER_UI_WEBUI_FLAGS_UI_H_ #pragma once -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" class PrefService; class RefCountedMemory; -class FlagsUI : public ChromeWebUI { +class FlagsUI : public WebUI { public: explicit FlagsUI(content::WebContents* contents); diff --git a/chrome/browser/ui/webui/flash_ui.cc b/chrome/browser/ui/webui/flash_ui.cc index ba88a3a..726e59c 100644 --- a/chrome/browser/ui/webui/flash_ui.cc +++ b/chrome/browser/ui/webui/flash_ui.cc @@ -367,7 +367,7 @@ void FlashDOMHandler::MaybeRespondToPage() { // /////////////////////////////////////////////////////////////////////////////// -FlashUI::FlashUI(WebContents* contents) : ChromeWebUI(contents) { +FlashUI::FlashUI(WebContents* contents) : WebUI(contents) { content::RecordAction( UserMetricsAction("ViewAboutFlash")); diff --git a/chrome/browser/ui/webui/flash_ui.h b/chrome/browser/ui/webui/flash_ui.h index a8ccd5f..54c71c5 100644 --- a/chrome/browser/ui/webui/flash_ui.h +++ b/chrome/browser/ui/webui/flash_ui.h @@ -6,12 +6,12 @@ #define CHROME_BROWSER_UI_WEBUI_FLASH_UI_H_ #pragma once -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" class RefCountedMemory; // The Web UI handler for about:flash. -class FlashUI : public ChromeWebUI { +class FlashUI : public WebUI { public: explicit FlashUI(content::WebContents* contents); diff --git a/chrome/browser/ui/webui/gpu_internals_ui.cc b/chrome/browser/ui/webui/gpu_internals_ui.cc index 2034b23..e93ebaf 100644 --- a/chrome/browser/ui/webui/gpu_internals_ui.cc +++ b/chrome/browser/ui/webui/gpu_internals_ui.cc @@ -239,7 +239,7 @@ void GpuMessageHandler::OnGpuInfoUpdate() { // //////////////////////////////////////////////////////////////////////////////// -GpuInternalsUI::GpuInternalsUI(WebContents* contents) : ChromeWebUI(contents) { +GpuInternalsUI::GpuInternalsUI(WebContents* contents) : WebUI(contents) { AddMessageHandler(new GpuMessageHandler()); // Set up the chrome://gpu-internals/ source. diff --git a/chrome/browser/ui/webui/gpu_internals_ui.h b/chrome/browser/ui/webui/gpu_internals_ui.h index f82b7a3..c820b38 100644 --- a/chrome/browser/ui/webui/gpu_internals_ui.h +++ b/chrome/browser/ui/webui/gpu_internals_ui.h @@ -6,9 +6,9 @@ #define CHROME_BROWSER_UI_WEBUI_GPU_INTERNALS_UI_H_ #pragma once -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" -class GpuInternalsUI : public ChromeWebUI { +class GpuInternalsUI : public WebUI { public: explicit GpuInternalsUI(content::WebContents* contents); diff --git a/chrome/browser/ui/webui/history_ui.cc b/chrome/browser/ui/webui/history_ui.cc index 0a87f46..cdd156b 100644 --- a/chrome/browser/ui/webui/history_ui.cc +++ b/chrome/browser/ui/webui/history_ui.cc @@ -423,7 +423,7 @@ void BrowsingHistoryHandler::Observe( // //////////////////////////////////////////////////////////////////////////////// -HistoryUI::HistoryUI(WebContents* contents) : ChromeWebUI(contents) { +HistoryUI::HistoryUI(WebContents* contents) : WebUI(contents) { AddMessageHandler(new BrowsingHistoryHandler()); HistoryUIHTMLSource* html_source = new HistoryUIHTMLSource(); diff --git a/chrome/browser/ui/webui/history_ui.h b/chrome/browser/ui/webui/history_ui.h index ec96ccb..e03dd09 100644 --- a/chrome/browser/ui/webui/history_ui.h +++ b/chrome/browser/ui/webui/history_ui.h @@ -12,7 +12,7 @@ #include "chrome/browser/cancelable_request.h" #include "chrome/browser/history/history.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_ui_message_handler.h" @@ -78,7 +78,7 @@ class BrowsingHistoryHandler : public content::WebUIMessageHandler, DISALLOW_COPY_AND_ASSIGN(BrowsingHistoryHandler); }; -class HistoryUI : public ChromeWebUI { +class HistoryUI : public WebUI { public: explicit HistoryUI(content::WebContents* contents); diff --git a/chrome/browser/ui/webui/html_dialog_ui.cc b/chrome/browser/ui/webui/html_dialog_ui.cc index 8950d41..31abaa1 100644 --- a/chrome/browser/ui/webui/html_dialog_ui.cc +++ b/chrome/browser/ui/webui/html_dialog_ui.cc @@ -23,7 +23,7 @@ static base::LazyInstance<base::PropertyAccessor<HtmlDialogUIDelegate*> > g_html_dialog_ui_property_accessor = LAZY_INSTANCE_INITIALIZER; HtmlDialogUI::HtmlDialogUI(WebContents* web_contents) - : ChromeWebUI(web_contents) { + : WebUI(web_contents) { } HtmlDialogUI::~HtmlDialogUI() { @@ -78,7 +78,7 @@ void HtmlDialogUI::RenderViewCreated(RenderViewHost* render_view_host) { content::Source<WebUI>(this), content::Details<RenderViewHost>(render_view_host)); - ChromeWebUI::RenderViewCreated(render_view_host); + WebUI::RenderViewCreated(render_view_host); } void HtmlDialogUI::OnDialogClosed(const ListValue* args) { diff --git a/chrome/browser/ui/webui/html_dialog_ui.h b/chrome/browser/ui/webui/html_dialog_ui.h index f4216c4..84b74cc 100644 --- a/chrome/browser/ui/webui/html_dialog_ui.h +++ b/chrome/browser/ui/webui/html_dialog_ui.h @@ -10,7 +10,7 @@ #include <vector> #include "base/string16.h" -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" #include "googleurl/src/gurl.h" #include "ui/gfx/rect.h" @@ -94,7 +94,7 @@ class HtmlDialogUIDelegate { // there and call it back. This is a bit of a hack to allow the dialog to pass // its delegate to the Web UI without having nasty accessors on the WebContents. // The correct design using RVH directly would avoid all of this. -class HtmlDialogUI : public ChromeWebUI { +class HtmlDialogUI : public WebUI { public: struct HtmlDialogParams { // The URL for the content that will be loaded in the dialog. diff --git a/chrome/browser/ui/webui/hung_renderer_dialog.cc b/chrome/browser/ui/webui/hung_renderer_dialog.cc index 7fb073b..28ef521 100644 --- a/chrome/browser/ui/webui/hung_renderer_dialog.cc +++ b/chrome/browser/ui/webui/hung_renderer_dialog.cc @@ -18,11 +18,11 @@ #include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/tab_contents/core_tab_helper.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" +#include "chrome/browser/ui/webui/chrome_web_ui.h" #include "chrome/browser/ui/webui/html_dialog_ui.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/url_constants.h" #include "content/browser/renderer_host/render_view_host.h" -#include "content/browser/webui/web_ui.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/result_codes.h" @@ -46,7 +46,7 @@ void ShowHungRendererDialog(WebContents* contents) { #else // TODO(rbyers): Remove IsMoreWebUI check once we decide for sure which // platforms will use the WebUI version of this dialog. - if (ChromeWebUI::IsMoreWebUI()) + if (chrome_web_ui::IsMoreWebUI()) HungRendererDialog::ShowHungRendererDialog(contents); else ShowNativeHungRendererDialog(contents); @@ -57,7 +57,7 @@ void HideHungRendererDialog(WebContents* contents) { #if defined(OS_CHROMEOS) || defined(USE_AURA) HungRendererDialog::HideHungRendererDialog(contents); #else - if (ChromeWebUI::IsMoreWebUI()) + if (chrome_web_ui::IsMoreWebUI()) HungRendererDialog::HideHungRendererDialog(contents); else HideNativeHungRendererDialog(contents); diff --git a/chrome/browser/ui/webui/keyboard_ui.cc b/chrome/browser/ui/webui/keyboard_ui.cc index 6200e11..5b21b62 100644 --- a/chrome/browser/ui/webui/keyboard_ui.cc +++ b/chrome/browser/ui/webui/keyboard_ui.cc @@ -19,7 +19,7 @@ using content::WebContents; // KeyboardUI KeyboardUI::KeyboardUI(WebContents* contents) - : ChromeWebUI(contents) { + : WebUI(contents) { KeyboardHTMLSource* html_source = new KeyboardHTMLSource(); Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext()); profile->GetChromeURLDataManager()->AddDataSource(html_source); diff --git a/chrome/browser/ui/webui/keyboard_ui.h b/chrome/browser/ui/webui/keyboard_ui.h index fe24a09..82cd495 100644 --- a/chrome/browser/ui/webui/keyboard_ui.h +++ b/chrome/browser/ui/webui/keyboard_ui.h @@ -9,10 +9,10 @@ #include <string> #include "chrome/browser/ui/webui/chrome_url_data_manager.h" -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" // The TabContents used for the keyboard page. -class KeyboardUI : public ChromeWebUI { +class KeyboardUI : public WebUI { public: explicit KeyboardUI(content::WebContents* manager); virtual ~KeyboardUI(); diff --git a/chrome/browser/ui/webui/media/media_internals_ui.cc b/chrome/browser/ui/webui/media/media_internals_ui.cc index f479e9a..3fdc900 100644 --- a/chrome/browser/ui/webui/media/media_internals_ui.cc +++ b/chrome/browser/ui/webui/media/media_internals_ui.cc @@ -39,7 +39,7 @@ ChromeWebUIDataSource* CreateMediaInternalsHTMLSource() { //////////////////////////////////////////////////////////////////////////////// MediaInternalsUI::MediaInternalsUI(WebContents* contents) - : ChromeWebUI(contents) { + : WebUI(contents) { AddMessageHandler(new MediaInternalsMessageHandler()); Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext()); diff --git a/chrome/browser/ui/webui/media/media_internals_ui.h b/chrome/browser/ui/webui/media/media_internals_ui.h index 02bfc6e..9e31f24 100644 --- a/chrome/browser/ui/webui/media/media_internals_ui.h +++ b/chrome/browser/ui/webui/media/media_internals_ui.h @@ -6,10 +6,10 @@ #define CHROME_BROWSER_UI_WEBUI_MEDIA_MEDIA_INTERNALS_UI_H_ #pragma once -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" // The implementation for the chrome://media-internals page. -class MediaInternalsUI : public ChromeWebUI { +class MediaInternalsUI : public WebUI { public: explicit MediaInternalsUI(content::WebContents* contents); diff --git a/chrome/browser/ui/webui/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals_ui.cc index a71ac9f..2d2bd9ef 100644 --- a/chrome/browser/ui/webui/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals_ui.cc @@ -1637,7 +1637,7 @@ Value* NetInternalsUI::GetConstants() { return constants_dict; } -NetInternalsUI::NetInternalsUI(WebContents* contents) : ChromeWebUI(contents) { +NetInternalsUI::NetInternalsUI(WebContents* contents) : WebUI(contents) { AddMessageHandler(new NetInternalsMessageHandler()); // Set up the chrome://net-internals/ source. diff --git a/chrome/browser/ui/webui/net_internals_ui.h b/chrome/browser/ui/webui/net_internals_ui.h index e89de97..e6e62a1 100644 --- a/chrome/browser/ui/webui/net_internals_ui.h +++ b/chrome/browser/ui/webui/net_internals_ui.h @@ -6,13 +6,13 @@ #define CHROME_BROWSER_UI_WEBUI_NET_INTERNALS_UI_H_ #pragma once -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" namespace base { class Value; } -class NetInternalsUI : public ChromeWebUI { +class NetInternalsUI : public WebUI { public: explicit NetInternalsUI(content::WebContents* contents); diff --git a/chrome/browser/ui/webui/network_action_predictor/network_action_predictor_ui.cc b/chrome/browser/ui/webui/network_action_predictor/network_action_predictor_ui.cc index 2c6204a..877b5b2 100644 --- a/chrome/browser/ui/webui/network_action_predictor/network_action_predictor_ui.cc +++ b/chrome/browser/ui/webui/network_action_predictor/network_action_predictor_ui.cc @@ -26,7 +26,7 @@ ChromeWebUIDataSource* CreateNetworkActionPredictorUIHTMLSource() { NetworkActionPredictorUI::NetworkActionPredictorUI( content::WebContents* contents) - : ChromeWebUI(contents) { + : WebUI(contents) { Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext()); AddMessageHandler(new NetworkActionPredictorDOMHandler(profile)); profile->GetChromeURLDataManager()->AddDataSource( diff --git a/chrome/browser/ui/webui/network_action_predictor/network_action_predictor_ui.h b/chrome/browser/ui/webui/network_action_predictor/network_action_predictor_ui.h index dc4f1c8..185ab87 100644 --- a/chrome/browser/ui/webui/network_action_predictor/network_action_predictor_ui.h +++ b/chrome/browser/ui/webui/network_action_predictor/network_action_predictor_ui.h @@ -6,9 +6,9 @@ #define CHROME_BROWSER_UI_WEBUI_NETWORK_ACTION_PREDICTOR_NETWORK_ACTION_PREDICTOR_UI_H_ #pragma once -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" -class NetworkActionPredictorUI : public ChromeWebUI { +class NetworkActionPredictorUI : public WebUI { public: explicit NetworkActionPredictorUI(content::WebContents* contents); diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc index bf91188..36e0d21 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc @@ -75,7 +75,7 @@ static base::LazyInstance<std::set<const WebUI*> > g_live_new_tabs; // NewTabUI NewTabUI::NewTabUI(WebContents* contents) - : ChromeWebUI(contents) { + : WebUI(contents) { g_live_new_tabs.Pointer()->insert(this); // Override some options on the Web UI. hide_favicon_ = true; @@ -172,12 +172,12 @@ bool NewTabUI::CanShowBookmarkBar() const { void NewTabUI::RenderViewCreated(RenderViewHost* render_view_host) { StartTimingPaint(render_view_host); - ChromeWebUI::RenderViewCreated(render_view_host); + WebUI::RenderViewCreated(render_view_host); } void NewTabUI::RenderViewReused(RenderViewHost* render_view_host) { StartTimingPaint(render_view_host); - ChromeWebUI::RenderViewReused(render_view_host); + WebUI::RenderViewReused(render_view_host); } void NewTabUI::Observe(int type, diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.h b/chrome/browser/ui/webui/ntp/new_tab_ui.h index f300a36..e8c07cd 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.h +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.h @@ -13,7 +13,7 @@ #include "base/timer.h" #include "chrome/browser/sessions/tab_restore_service.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" @@ -22,7 +22,7 @@ class PrefService; class Profile; // The TabContents used for the New Tab page. -class NewTabUI : public ChromeWebUI, +class NewTabUI : public WebUI, public content::NotificationObserver { public: explicit NewTabUI(content::WebContents* manager); diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc index 03f8675..e9a9dd8 100644 --- a/chrome/browser/ui/webui/options/options_ui.cc +++ b/chrome/browser/ui/webui/options/options_ui.cc @@ -199,7 +199,7 @@ void OptionsPageUIHandler::RegisterTitle(DictionaryValue* localized_strings, //////////////////////////////////////////////////////////////////////////////// OptionsUI::OptionsUI(WebContents* contents) - : ChromeWebUI(contents), + : WebUI(contents), initialized_handlers_(false) { DictionaryValue* localized_strings = new DictionaryValue(); @@ -302,12 +302,12 @@ OptionsUI::~OptionsUI() { // Override. void OptionsUI::RenderViewCreated(RenderViewHost* render_view_host) { SetCommandLineString(render_view_host); - ChromeWebUI::RenderViewCreated(render_view_host); + WebUI::RenderViewCreated(render_view_host); } void OptionsUI::RenderViewReused(RenderViewHost* render_view_host) { SetCommandLineString(render_view_host); - ChromeWebUI::RenderViewReused(render_view_host); + WebUI::RenderViewReused(render_view_host); } void OptionsUI::DidBecomeActiveForReusedRenderView() { @@ -319,7 +319,7 @@ void OptionsUI::DidBecomeActiveForReusedRenderView() { // initialized). CallJavascriptFunction("OptionsPage.reinitializeCore"); - ChromeWebUI::DidBecomeActiveForReusedRenderView(); + WebUI::DidBecomeActiveForReusedRenderView(); } // static diff --git a/chrome/browser/ui/webui/options/options_ui.h b/chrome/browser/ui/webui/options/options_ui.h index 3269fa9..7b4f6af 100644 --- a/chrome/browser/ui/webui/options/options_ui.h +++ b/chrome/browser/ui/webui/options/options_ui.h @@ -11,7 +11,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_types.h" @@ -79,7 +79,7 @@ class OptionsPageUIHandlerHost { }; // The WebUI for chrome:settings. -class OptionsUI : public ChromeWebUI, +class OptionsUI : public WebUI, public OptionsPageUIHandlerHost { public: explicit OptionsUI(content::WebContents* contents); diff --git a/chrome/browser/ui/webui/options2/options_ui2.cc b/chrome/browser/ui/webui/options2/options_ui2.cc index 3e7fe68..793064b 100644 --- a/chrome/browser/ui/webui/options2/options_ui2.cc +++ b/chrome/browser/ui/webui/options2/options_ui2.cc @@ -197,7 +197,7 @@ void OptionsPageUIHandler::RegisterTitle(DictionaryValue* localized_strings, //////////////////////////////////////////////////////////////////////////////// OptionsUI::OptionsUI(WebContents* contents) - : ChromeWebUI(contents), + : WebUI(contents), initialized_handlers_(false) { DictionaryValue* localized_strings = new DictionaryValue(); @@ -301,12 +301,12 @@ OptionsUI::~OptionsUI() { // Override. void OptionsUI::RenderViewCreated(RenderViewHost* render_view_host) { SetCommandLineString(render_view_host); - ChromeWebUI::RenderViewCreated(render_view_host); + WebUI::RenderViewCreated(render_view_host); } void OptionsUI::RenderViewReused(RenderViewHost* render_view_host) { SetCommandLineString(render_view_host); - ChromeWebUI::RenderViewReused(render_view_host); + WebUI::RenderViewReused(render_view_host); } void OptionsUI::DidBecomeActiveForReusedRenderView() { @@ -318,7 +318,7 @@ void OptionsUI::DidBecomeActiveForReusedRenderView() { // initialized). CallJavascriptFunction("OptionsPage.reinitializeCore"); - ChromeWebUI::DidBecomeActiveForReusedRenderView(); + WebUI::DidBecomeActiveForReusedRenderView(); } // static diff --git a/chrome/browser/ui/webui/options2/options_ui2.h b/chrome/browser/ui/webui/options2/options_ui2.h index c4df1d1..f443c21 100644 --- a/chrome/browser/ui/webui/options2/options_ui2.h +++ b/chrome/browser/ui/webui/options2/options_ui2.h @@ -11,7 +11,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_types.h" @@ -81,7 +81,7 @@ class OptionsPageUIHandlerHost { }; // The WebUI for chrome:settings-frame. -class OptionsUI : public ChromeWebUI, +class OptionsUI : public WebUI, public OptionsPageUIHandlerHost { public: explicit OptionsUI(content::WebContents* contents); diff --git a/chrome/browser/ui/webui/plugins_ui.cc b/chrome/browser/ui/webui/plugins_ui.cc index 7b7895f..be3bb9d 100644 --- a/chrome/browser/ui/webui/plugins_ui.cc +++ b/chrome/browser/ui/webui/plugins_ui.cc @@ -374,7 +374,7 @@ void PluginsDOMHandler::PluginsLoaded(const std::vector<PluginGroup>& groups) { // /////////////////////////////////////////////////////////////////////////////// -PluginsUI::PluginsUI(WebContents* contents) : ChromeWebUI(contents) { +PluginsUI::PluginsUI(WebContents* contents) : WebUI(contents) { AddMessageHandler(new PluginsDOMHandler()); // Set up the chrome://plugins/ source. diff --git a/chrome/browser/ui/webui/plugins_ui.h b/chrome/browser/ui/webui/plugins_ui.h index fc57352..3c2b010 100644 --- a/chrome/browser/ui/webui/plugins_ui.h +++ b/chrome/browser/ui/webui/plugins_ui.h @@ -6,12 +6,12 @@ #define CHROME_BROWSER_UI_WEBUI_PLUGINS_UI_H_ #pragma once -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" class PrefService; class RefCountedMemory; -class PluginsUI : public ChromeWebUI { +class PluginsUI : public WebUI { public: explicit PluginsUI(content::WebContents* contents); diff --git a/chrome/browser/ui/webui/policy_ui.cc b/chrome/browser/ui/webui/policy_ui.cc index 20986f9..875823e 100644 --- a/chrome/browser/ui/webui/policy_ui.cc +++ b/chrome/browser/ui/webui/policy_ui.cc @@ -233,7 +233,7 @@ string16 PolicyUIHandler::CreateStatusMessageString( // //////////////////////////////////////////////////////////////////////////////// -PolicyUI::PolicyUI(WebContents* contents) : ChromeWebUI(contents) { +PolicyUI::PolicyUI(WebContents* contents) : WebUI(contents) { AddMessageHandler(new PolicyUIHandler); // Set up the chrome://policy/ source. diff --git a/chrome/browser/ui/webui/policy_ui.h b/chrome/browser/ui/webui/policy_ui.h index 044d909..943be7e 100644 --- a/chrome/browser/ui/webui/policy_ui.h +++ b/chrome/browser/ui/webui/policy_ui.h @@ -10,7 +10,7 @@ #include "base/values.h" #include "chrome/browser/policy/cloud_policy_subsystem.h" #include "chrome/browser/policy/configuration_policy_reader.h" -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" #include "content/public/browser/web_ui_message_handler.h" namespace policy { @@ -70,7 +70,7 @@ class PolicyUIHandler : public content::WebUIMessageHandler, }; // The Web UI handler for about:policy. -class PolicyUI : public ChromeWebUI { +class PolicyUI : public WebUI { public: explicit PolicyUI(content::WebContents* contents); virtual ~PolicyUI(); diff --git a/chrome/browser/ui/webui/profiler_ui.cc b/chrome/browser/ui/webui/profiler_ui.cc index 0c08b60..b42980a 100644 --- a/chrome/browser/ui/webui/profiler_ui.cc +++ b/chrome/browser/ui/webui/profiler_ui.cc @@ -144,7 +144,7 @@ void ProfilerMessageHandler::OnResetData(const ListValue* list) { } // namespace -ProfilerUI::ProfilerUI(WebContents* contents) : ChromeWebUI(contents) { +ProfilerUI::ProfilerUI(WebContents* contents) : WebUI(contents) { ui_weak_ptr_factory_.reset(new base::WeakPtrFactory<ProfilerUI>(this)); ui_weak_ptr_ = ui_weak_ptr_factory_->GetWeakPtr(); diff --git a/chrome/browser/ui/webui/profiler_ui.h b/chrome/browser/ui/webui/profiler_ui.h index 6377e07..604d47c 100644 --- a/chrome/browser/ui/webui/profiler_ui.h +++ b/chrome/browser/ui/webui/profiler_ui.h @@ -9,10 +9,10 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/values.h" -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" // The C++ back-end for the chrome://profiler webui page. -class ProfilerUI : public ChromeWebUI { +class ProfilerUI : public WebUI { public: explicit ProfilerUI(content::WebContents* contents); virtual ~ProfilerUI(); diff --git a/chrome/browser/ui/webui/quota_internals_ui.cc b/chrome/browser/ui/webui/quota_internals_ui.cc index a248c58..3f05655 100644 --- a/chrome/browser/ui/webui/quota_internals_ui.cc +++ b/chrome/browser/ui/webui/quota_internals_ui.cc @@ -37,7 +37,7 @@ ChromeWebUIDataSource* CreateQuotaInternalsHTMLSource() { } // namespace QuotaInternalsUI::QuotaInternalsUI(WebContents* contents) - : ChromeWebUI(contents) { + : WebUI(contents) { AddMessageHandler(new quota_internals::QuotaInternalsHandler); Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext()); profile->GetChromeURLDataManager()->AddDataSource( diff --git a/chrome/browser/ui/webui/quota_internals_ui.h b/chrome/browser/ui/webui/quota_internals_ui.h index 82d82a0..dabbda3 100644 --- a/chrome/browser/ui/webui/quota_internals_ui.h +++ b/chrome/browser/ui/webui/quota_internals_ui.h @@ -6,11 +6,9 @@ #define CHROME_BROWSER_UI_WEBUI_QUOTA_INTERNALS_UI_H_ #pragma once -#include <string> +#include "content/browser/webui/web_ui.h" -#include "chrome/browser/ui/webui/chrome_web_ui.h" - -class QuotaInternalsUI : public ChromeWebUI { +class QuotaInternalsUI : public WebUI { public: explicit QuotaInternalsUI(content::WebContents* contents); virtual ~QuotaInternalsUI() {} diff --git a/chrome/browser/ui/webui/sessions_ui.cc b/chrome/browser/ui/webui/sessions_ui.cc index 5ac2eef..fd04f30 100644 --- a/chrome/browser/ui/webui/sessions_ui.cc +++ b/chrome/browser/ui/webui/sessions_ui.cc @@ -257,7 +257,7 @@ void SessionsDOMHandler::UpdateUI() { // /////////////////////////////////////////////////////////////////////////////// -SessionsUI::SessionsUI(WebContents* contents) : ChromeWebUI(contents) { +SessionsUI::SessionsUI(WebContents* contents) : WebUI(contents) { AddMessageHandler(new SessionsDOMHandler()); // Set up the chrome://sessions/ source. diff --git a/chrome/browser/ui/webui/sessions_ui.h b/chrome/browser/ui/webui/sessions_ui.h index b62d686..5a3e489 100644 --- a/chrome/browser/ui/webui/sessions_ui.h +++ b/chrome/browser/ui/webui/sessions_ui.h @@ -6,11 +6,11 @@ #define CHROME_BROWSER_UI_WEBUI_SESSIONS_UI_H_ #pragma once -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" class RefCountedMemory; -class SessionsUI : public ChromeWebUI { +class SessionsUI : public WebUI { public: explicit SessionsUI(content::WebContents* contents); diff --git a/chrome/browser/ui/webui/ssl_client_certificate_selector_webui.cc b/chrome/browser/ui/webui/ssl_client_certificate_selector_webui.cc index ba285aa..fe70336 100644 --- a/chrome/browser/ui/webui/ssl_client_certificate_selector_webui.cc +++ b/chrome/browser/ui/webui/ssl_client_certificate_selector_webui.cc @@ -18,6 +18,7 @@ #include "chrome/browser/ssl_client_certificate_selector.h" #include "chrome/browser/ui/crypto_module_password_dialog.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" +#include "chrome/browser/ui/webui/chrome_web_ui.h" #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" #include "chrome/browser/ui/webui/constrained_html_ui.h" #include "chrome/common/net/x509_certificate_model.h" @@ -302,7 +303,7 @@ void ShowSSLClientCertificateSelector( // TODO(rbyers): Remove the IsMoreWebUI check and (ideally) all #ifdefs onnce // we can select exactly one version of this dialog to use for each platform // at build time. http://crbug.com/102775 - if (ChromeWebUI::IsMoreWebUI()) + if (chrome_web_ui::IsMoreWebUI()) SSLClientCertificateSelectorWebUI::ShowDialog(wrapper, cert_request_info, delegate); diff --git a/chrome/browser/ui/webui/sync_internals_ui.cc b/chrome/browser/ui/webui/sync_internals_ui.cc index d90e632..249fd09 100644 --- a/chrome/browser/ui/webui/sync_internals_ui.cc +++ b/chrome/browser/ui/webui/sync_internals_ui.cc @@ -73,7 +73,7 @@ ProfileSyncService* GetProfileSyncService(Profile* profile) { } // namespace SyncInternalsUI::SyncInternalsUI(WebContents* contents) - : ChromeWebUI(contents), + : WebUI(contents), weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { // TODO(akalin): Fix. Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext()); diff --git a/chrome/browser/ui/webui/sync_internals_ui.h b/chrome/browser/ui/webui/sync_internals_ui.h index 673dc91..21a7982 100644 --- a/chrome/browser/ui/webui/sync_internals_ui.h +++ b/chrome/browser/ui/webui/sync_internals_ui.h @@ -13,14 +13,14 @@ #include "base/memory/weak_ptr.h" #include "chrome/browser/sync/js/js_event_handler.h" #include "chrome/browser/sync/js/js_reply_handler.h" -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" namespace browser_sync { class JsController; } // namespace browser_sync // The implementation for the chrome://sync-internals page. -class SyncInternalsUI : public ChromeWebUI, +class SyncInternalsUI : public WebUI, public browser_sync::JsEventHandler, public browser_sync::JsReplyHandler { public: diff --git a/chrome/browser/ui/webui/sync_promo/sync_promo_ui.cc b/chrome/browser/ui/webui/sync_promo/sync_promo_ui.cc index b2b0827..0bf5cb4 100644 --- a/chrome/browser/ui/webui/sync_promo/sync_promo_ui.cc +++ b/chrome/browser/ui/webui/sync_promo/sync_promo_ui.cc @@ -105,7 +105,7 @@ bool GetValueForKeyInQuery(const GURL& url, const std::string& search_key, } // namespace -SyncPromoUI::SyncPromoUI(WebContents* contents) : ChromeWebUI(contents) { +SyncPromoUI::SyncPromoUI(WebContents* contents) : WebUI(contents) { should_hide_url_ = true; SyncPromoHandler* handler = new SyncPromoHandler( diff --git a/chrome/browser/ui/webui/sync_promo/sync_promo_ui.h b/chrome/browser/ui/webui/sync_promo/sync_promo_ui.h index 206c559..ec43711 100644 --- a/chrome/browser/ui/webui/sync_promo/sync_promo_ui.h +++ b/chrome/browser/ui/webui/sync_promo/sync_promo_ui.h @@ -6,13 +6,13 @@ #define CHROME_BROWSER_UI_WEBUI_SYNC_PROMO_SYNC_PROMO_UI_H_ #pragma once -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" class Profile; class PrefService; // The Web UI handler for chrome://syncpromo. -class SyncPromoUI : public ChromeWebUI { +class SyncPromoUI : public WebUI { public: // Constructs a SyncPromoUI. |contents| is the WebContents that this WebUI is // associated with. |contents| may not be NULL. diff --git a/chrome/browser/ui/webui/task_manager_ui.cc b/chrome/browser/ui/webui/task_manager_ui.cc index 40a4d61..b569938 100644 --- a/chrome/browser/ui/webui/task_manager_ui.cc +++ b/chrome/browser/ui/webui/task_manager_ui.cc @@ -77,7 +77,7 @@ ChromeWebUIDataSource* CreateTaskManagerUIHTMLSource() { // /////////////////////////////////////////////////////////////////////////////// -TaskManagerUI::TaskManagerUI(WebContents* contents) : ChromeWebUI(contents) { +TaskManagerUI::TaskManagerUI(WebContents* contents) : WebUI(contents) { AddMessageHandler(new TaskManagerHandler(TaskManager::GetInstance())); // Set up the chrome://taskmanager/ source. diff --git a/chrome/browser/ui/webui/task_manager_ui.h b/chrome/browser/ui/webui/task_manager_ui.h index 5e1dd97..0c51718 100644 --- a/chrome/browser/ui/webui/task_manager_ui.h +++ b/chrome/browser/ui/webui/task_manager_ui.h @@ -6,9 +6,9 @@ #define CHROME_BROWSER_UI_WEBUI_TASK_MANAGER_UI_H_ #pragma once -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" -class TaskManagerUI : public ChromeWebUI { +class TaskManagerUI : public WebUI { public: explicit TaskManagerUI(content::WebContents* contents); diff --git a/chrome/browser/ui/webui/test_chrome_web_ui_factory_browsertest.cc b/chrome/browser/ui/webui/test_chrome_web_ui_factory_browsertest.cc index 0e8d94a..ad58c4e 100644 --- a/chrome/browser/ui/webui/test_chrome_web_ui_factory_browsertest.cc +++ b/chrome/browser/ui/webui/test_chrome_web_ui_factory_browsertest.cc @@ -19,7 +19,7 @@ namespace { // Returns a new WebUI object for the TabContents from |arg0|. ACTION(ReturnNewWebUI) { - return new ChromeWebUI(arg0); + return new WebUI(arg0); } // Mock the TestChromeWebUIFactory::WebUIProvider to prove that we are called as diff --git a/chrome/browser/ui/webui/tracing_ui.cc b/chrome/browser/ui/webui/tracing_ui.cc index ea1bfdb..cab2742 100644 --- a/chrome/browser/ui/webui/tracing_ui.cc +++ b/chrome/browser/ui/webui/tracing_ui.cc @@ -411,7 +411,7 @@ void TracingMessageHandler::OnTraceBufferPercentFullReply(float percent_full) { // //////////////////////////////////////////////////////////////////////////////// -TracingUI::TracingUI(WebContents* contents) : ChromeWebUI(contents) { +TracingUI::TracingUI(WebContents* contents) : WebUI(contents) { AddMessageHandler(new TracingMessageHandler()); // Set up the chrome://tracing/ source. diff --git a/chrome/browser/ui/webui/tracing_ui.h b/chrome/browser/ui/webui/tracing_ui.h index b592f2e..93d7a7c 100644 --- a/chrome/browser/ui/webui/tracing_ui.h +++ b/chrome/browser/ui/webui/tracing_ui.h @@ -6,10 +6,10 @@ #define CHROME_BROWSER_UI_WEBUI_TRACING_UI_H_ #pragma once -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" // The C++ back-end for the chrome://tracing webui page. -class TracingUI : public ChromeWebUI { +class TracingUI : public WebUI { public: explicit TracingUI(content::WebContents* contents); diff --git a/chrome/browser/ui/webui/uber/uber_ui.cc b/chrome/browser/ui/webui/uber/uber_ui.cc index 571322f..0e5a175 100644 --- a/chrome/browser/ui/webui/uber/uber_ui.cc +++ b/chrome/browser/ui/webui/uber/uber_ui.cc @@ -45,7 +45,7 @@ ChromeWebUIDataSource* CreateUberHTMLSource() { } // namespace -UberUI::UberUI(WebContents* contents) : ChromeWebUI(contents) { +UberUI::UberUI(WebContents* contents) : WebUI(contents) { Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext()); profile->GetChromeURLDataManager()->AddDataSource(CreateUberHTMLSource()); @@ -58,9 +58,8 @@ UberUI::~UberUI() { } void UberUI::RegisterSubpage(const std::string& page_url) { - ChromeWebUI* web_ui = static_cast<ChromeWebUI*>( - ChromeWebUIFactory::GetInstance()->CreateWebUIForURL( - static_cast<TabContents*>(web_contents_), GURL(page_url))); + WebUI* web_ui = ChromeWebUIFactory::GetInstance()->CreateWebUIForURL( + static_cast<TabContents*>(web_contents_), GURL(page_url)); web_ui->set_frame_xpath("//iframe[@src='" + page_url + "']"); sub_uis_[page_url] = web_ui; @@ -72,7 +71,7 @@ void UberUI::RenderViewCreated(RenderViewHost* render_view_host) { iter->second->RenderViewCreated(render_view_host); } - ChromeWebUI::RenderViewCreated(render_view_host); + WebUI::RenderViewCreated(render_view_host); } void UberUI::RenderViewReused(RenderViewHost* render_view_host) { @@ -81,7 +80,7 @@ void UberUI::RenderViewReused(RenderViewHost* render_view_host) { iter->second->RenderViewReused(render_view_host); } - ChromeWebUI::RenderViewReused(render_view_host); + WebUI::RenderViewReused(render_view_host); } void UberUI::DidBecomeActiveForReusedRenderView() { @@ -90,7 +89,7 @@ void UberUI::DidBecomeActiveForReusedRenderView() { iter->second->DidBecomeActiveForReusedRenderView(); } - ChromeWebUI::DidBecomeActiveForReusedRenderView(); + WebUI::DidBecomeActiveForReusedRenderView(); } void UberUI::OnWebUISend(const GURL& source_url, @@ -101,7 +100,7 @@ void UberUI::OnWebUISend(const GURL& source_url, if (subpage == sub_uis_.end()) { // The message was sent from the uber page itself. DCHECK_EQ(std::string(chrome::kChromeUIUberHost), source_url.host()); - ChromeWebUI::OnWebUISend(source_url, message, args); + WebUI::OnWebUISend(source_url, message, args); } else { // The message was sent from a subpage. subpage->second->OnWebUISend(source_url, message, args); diff --git a/chrome/browser/ui/webui/uber/uber_ui.h b/chrome/browser/ui/webui/uber/uber_ui.h index 1cabd5b..ce077af 100644 --- a/chrome/browser/ui/webui/uber/uber_ui.h +++ b/chrome/browser/ui/webui/uber/uber_ui.h @@ -10,17 +10,17 @@ #include "base/memory/scoped_vector.h" #include "base/values.h" -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" -// The ChromeWebUI class for the uber page (chrome://chrome). It manages the -// UI for the uber page (navigation bar and so forth) as well as ChromeWebUI -// objects for pages that appear in the uber page. -class UberUI : public ChromeWebUI { +// The WebUI class for the uber page (chrome://chrome). It manages the UI for +// the uber page (navigation bar and so forth) as well as WebUI objects for +// pages that appear in the uber page. +class UberUI : public WebUI { public: explicit UberUI(content::WebContents* contents); virtual ~UberUI(); - // ChromeWebUI implementation. + // WebUI implementation. virtual void OnWebUISend(const GURL& source_url, const std::string& message, const ListValue& args) OVERRIDE; @@ -32,7 +32,7 @@ class UberUI : public ChromeWebUI { private: // A map from URL origin to WebUI instance. - typedef std::map<std::string, ChromeWebUI*> SubpageMap; + typedef std::map<std::string, WebUI*> SubpageMap; // Creates and stores a WebUI for the given URL. void RegisterSubpage(const std::string& page_url); diff --git a/chrome/browser/ui/webui/web_ui_browsertest.cc b/chrome/browser/ui/webui/web_ui_browsertest.cc index ead8ed2..4614376 100644 --- a/chrome/browser/ui/webui/web_ui_browsertest.cc +++ b/chrome/browser/ui/webui/web_ui_browsertest.cc @@ -241,9 +241,9 @@ class MockWebUIProvider : public TestChromeWebUIFactory::WebUIProvider { public: MockWebUIProvider() {} - // Returns a new ChromeWebUI + // Returns a new WebUI WebUI* NewWebUI(WebContents* web_contents, const GURL& url) OVERRIDE { - return new ChromeWebUI(web_contents); + return new WebUI(web_contents); } }; diff --git a/chrome/browser/ui/webui/workers_ui.cc b/chrome/browser/ui/webui/workers_ui.cc index 8e72427..77982d6 100644 --- a/chrome/browser/ui/webui/workers_ui.cc +++ b/chrome/browser/ui/webui/workers_ui.cc @@ -253,7 +253,7 @@ class WorkersUI::WorkerCreationDestructionListener }; WorkersUI::WorkersUI(WebContents* contents) - : ChromeWebUI(contents), + : WebUI(contents), observer_(new WorkerCreationDestructionListener(this)){ AddMessageHandler(new WorkersDOMHandler()); diff --git a/chrome/browser/ui/webui/workers_ui.h b/chrome/browser/ui/webui/workers_ui.h index 5cb8ab8..94e80b0 100644 --- a/chrome/browser/ui/webui/workers_ui.h +++ b/chrome/browser/ui/webui/workers_ui.h @@ -7,9 +7,9 @@ #pragma once #include "base/memory/ref_counted.h" -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "content/browser/webui/web_ui.h" -class WorkersUI : public ChromeWebUI { +class WorkersUI : public WebUI { public: explicit WorkersUI(content::WebContents* contents); virtual ~WorkersUI(); |