diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-31 04:02:55 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-31 04:02:55 +0000 |
| commit | 26e2632ad09c70437fd40336cbee82af0d56a0d8 (patch) | |
| tree | 20fc6633eb78bcacee9ecb7e0517fd0407921799 | |
| parent | a0d75a4fc048c27289df8ecbf1982c7aa40bea6e (diff) | |
| download | chromium_src-26e2632ad09c70437fd40336cbee82af0d56a0d8.zip chromium_src-26e2632ad09c70437fd40336cbee82af0d56a0d8.tar.gz chromium_src-26e2632ad09c70437fd40336cbee82af0d56a0d8.tar.bz2 | |
Move WebUIMessageHandler to its own file in the public directory and put it in the content namespace.
BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/8986007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116057 0039d316-1c4b-4281-b951-d872f2087c98
123 files changed, 360 insertions, 198 deletions
diff --git a/chrome/browser/chromeos/choose_mobile_network_dialog.cc b/chrome/browser/chromeos/choose_mobile_network_dialog.cc index 3cd34f9..7d9d39f 100644 --- a/chrome/browser/chromeos/choose_mobile_network_dialog.cc +++ b/chrome/browser/chromeos/choose_mobile_network_dialog.cc @@ -15,6 +15,7 @@ #include "ui/views/widget/widget.h" using content::WebContents; +using content::WebUIMessageHandler; namespace { diff --git a/chrome/browser/chromeos/choose_mobile_network_dialog.h b/chrome/browser/chromeos/choose_mobile_network_dialog.h index 26ecc97..420e8a3 100644 --- a/chrome/browser/chromeos/choose_mobile_network_dialog.h +++ b/chrome/browser/chromeos/choose_mobile_network_dialog.h @@ -24,7 +24,7 @@ class ChooseMobileNetworkDialog : private HtmlDialogUIDelegate { virtual string16 GetDialogTitle() const OVERRIDE; virtual GURL GetDialogContentURL() const OVERRIDE; virtual void GetWebUIMessageHandlers( - std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE; + std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; virtual std::string GetDialogArgs() const OVERRIDE; virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; diff --git a/chrome/browser/chromeos/login/login_html_dialog.cc b/chrome/browser/chromeos/login/login_html_dialog.cc index 9e1dd26..f9be759 100644 --- a/chrome/browser/chromeos/login/login_html_dialog.cc +++ b/chrome/browser/chromeos/login/login_html_dialog.cc @@ -18,6 +18,7 @@ #include "ui/views/widget/widget.h" using content::WebContents; +using content::WebUIMessageHandler; namespace chromeos { diff --git a/chrome/browser/chromeos/login/login_html_dialog.h b/chrome/browser/chromeos/login/login_html_dialog.h index 49e2f61..2c9c901 100644 --- a/chrome/browser/chromeos/login/login_html_dialog.h +++ b/chrome/browser/chromeos/login/login_html_dialog.h @@ -60,7 +60,7 @@ class LoginHtmlDialog : public HtmlDialogUIDelegate, virtual string16 GetDialogTitle() const OVERRIDE; virtual GURL GetDialogContentURL() const OVERRIDE; virtual void GetWebUIMessageHandlers( - std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE; + std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; virtual std::string GetDialogArgs() const OVERRIDE; virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; diff --git a/chrome/browser/chromeos/sim_dialog_delegate.cc b/chrome/browser/chromeos/sim_dialog_delegate.cc index f44d965..8c39c8f 100644 --- a/chrome/browser/chromeos/sim_dialog_delegate.cc +++ b/chrome/browser/chromeos/sim_dialog_delegate.cc @@ -16,6 +16,7 @@ #include "ui/views/widget/widget.h" using content::WebContents; +using content::WebUIMessageHandler; namespace { diff --git a/chrome/browser/chromeos/sim_dialog_delegate.h b/chrome/browser/chromeos/sim_dialog_delegate.h index 833f680..dbb7f87 100644 --- a/chrome/browser/chromeos/sim_dialog_delegate.h +++ b/chrome/browser/chromeos/sim_dialog_delegate.h @@ -34,7 +34,7 @@ class SimDialogDelegate : public HtmlDialogUIDelegate { virtual string16 GetDialogTitle() const OVERRIDE; virtual GURL GetDialogContentURL() const OVERRIDE; virtual void GetWebUIMessageHandlers( - std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE; + std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; virtual std::string GetDialogArgs() const OVERRIDE; virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; 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 802ac21..21333ae 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc @@ -39,6 +39,7 @@ using content::OpenURLParams; using content::Referrer; using content::WebContents; +using content::WebUIMessageHandler; namespace { diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h index 6bb1945..7ca9a7f 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h @@ -71,7 +71,7 @@ class CloudPrintSetupFlow : public HtmlDialogUIDelegate, // HtmlDialogUIDelegate implementation. virtual GURL GetDialogContentURL() const OVERRIDE; virtual void GetWebUIMessageHandlers( - std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE; + std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; virtual std::string GetDialogArgs() const OVERRIDE; virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; 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 e9658d3..28581ba 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 @@ -10,6 +10,7 @@ #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h" +#include "content/browser/webui/web_ui.h" void CloudPrintSetupMessageHandler::RegisterMessages() { // Pass the WebUI object to the setup flow. diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_message_handler.h b/chrome/browser/printing/cloud_print/cloud_print_setup_message_handler.h index 377edab..05ff5c2 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_message_handler.h +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_message_handler.h @@ -8,12 +8,12 @@ #include <string> #include "base/values.h" -#include "chrome/browser/ui/webui/html_dialog_ui.h" +#include "content/public/browser/web_ui_message_handler.h" class CloudPrintSetupFlow; // This class is used to handle DOM messages from the setup dialog. -class CloudPrintSetupMessageHandler : public WebUIMessageHandler { +class CloudPrintSetupMessageHandler : public content::WebUIMessageHandler { public: explicit CloudPrintSetupMessageHandler(CloudPrintSetupFlow* flow) : flow_(flow) {} diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc index ebacc0f..af3d099 100644 --- a/chrome/browser/printing/print_dialog_cloud.cc +++ b/chrome/browser/printing/print_dialog_cloud.cc @@ -108,6 +108,7 @@ using content::BrowserThread; using content::NavigationEntry; using content::WebContents; +using content::WebUIMessageHandler; namespace internal_cloud_print_helpers { diff --git a/chrome/browser/printing/print_dialog_cloud_internal.h b/chrome/browser/printing/print_dialog_cloud_internal.h index 6e333a4..a4553c9 100644 --- a/chrome/browser/printing/print_dialog_cloud_internal.h +++ b/chrome/browser/printing/print_dialog_cloud_internal.h @@ -13,9 +13,9 @@ #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "chrome/browser/ui/webui/html_dialog_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/web_ui_message_handler.h" class GURL; class CloudPrintHtmlDialogDelegateTest; @@ -100,7 +100,7 @@ class CloudPrintHtmlDialogDelegate; // the renderer process - do we want a progress throbber shown? // Probably..), and packing up the PDF and job parameters and sending // them to the cloud. -class CloudPrintFlowHandler : public WebUIMessageHandler, +class CloudPrintFlowHandler : public content::WebUIMessageHandler, public content::NotificationObserver { public: CloudPrintFlowHandler(const FilePath& path_to_file, @@ -167,7 +167,7 @@ class CloudPrintHtmlDialogDelegate : public HtmlDialogUIDelegate { virtual string16 GetDialogTitle() const OVERRIDE; virtual GURL GetDialogContentURL() const OVERRIDE; virtual void GetWebUIMessageHandlers( - std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE; + std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; virtual std::string GetDialogArgs() const OVERRIDE; virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; diff --git a/chrome/browser/printing/print_dialog_cloud_unittest.cc b/chrome/browser/printing/print_dialog_cloud_unittest.cc index 6f26180..67eec09 100644 --- a/chrome/browser/printing/print_dialog_cloud_unittest.cc +++ b/chrome/browser/printing/print_dialog_cloud_unittest.cc @@ -30,6 +30,7 @@ using content::BrowserThread; using content::WebContents; +using content::WebUIMessageHandler; using testing::A; using testing::AtLeast; using testing::Eq; diff --git a/chrome/browser/printing/print_preview_tab_controller.cc b/chrome/browser/printing/print_preview_tab_controller.cc index 7fd044e..5a8cfc9 100644 --- a/chrome/browser/printing/print_preview_tab_controller.cc +++ b/chrome/browser/printing/print_preview_tab_controller.cc @@ -38,6 +38,7 @@ #include "webkit/plugins/webplugininfo.h" using content::WebContents; +using content::WebUIMessageHandler; namespace { diff --git a/chrome/browser/ui/cocoa/html_dialog_window_controller.mm b/chrome/browser/ui/cocoa/html_dialog_window_controller.mm index e13c5df..62df816 100644 --- a/chrome/browser/ui/cocoa/html_dialog_window_controller.mm +++ b/chrome/browser/ui/cocoa/html_dialog_window_controller.mm @@ -17,10 +17,12 @@ #include "chrome/browser/ui/webui/html_dialog_ui.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/public/browser/native_web_keyboard_event.h" +#include "content/public/browser/web_ui_message_handler.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/gfx/size.h" using content::WebContents; +using content::WebUIMessageHandler; // Thin bridge that routes notifications to // HtmlDialogWindowController's member variables. 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 f10cfd5c..5387e37 100644 --- a/chrome/browser/ui/cocoa/html_dialog_window_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/html_dialog_window_controller_unittest.mm @@ -18,12 +18,14 @@ #include "chrome/test/base/browser_with_test_window_test.h" #include "chrome/test/base/testing_profile.h" #include "content/browser/webui/web_ui.h" +#include "content/public/browser/web_ui_message_handler.h" #include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/size.h" using content::WebContents; +using content::WebUIMessageHandler; namespace { diff --git a/chrome/browser/ui/gtk/html_dialog_gtk.cc b/chrome/browser/ui/gtk/html_dialog_gtk.cc index 1337872..05fc47f 100644 --- a/chrome/browser/ui/gtk/html_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/html_dialog_gtk.cc @@ -19,6 +19,7 @@ #include "content/public/browser/native_web_keyboard_event.h" using content::WebContents; +using content::WebUIMessageHandler; namespace browser { diff --git a/chrome/browser/ui/gtk/html_dialog_gtk.h b/chrome/browser/ui/gtk/html_dialog_gtk.h index 55193af..8c6efec 100644 --- a/chrome/browser/ui/gtk/html_dialog_gtk.h +++ b/chrome/browser/ui/gtk/html_dialog_gtk.h @@ -39,7 +39,7 @@ class HtmlDialogGtk : public HtmlDialogTabContentsDelegate, virtual string16 GetDialogTitle() const OVERRIDE; virtual GURL GetDialogContentURL() const OVERRIDE; virtual void GetWebUIMessageHandlers( - std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE; + std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; virtual std::string GetDialogArgs() const OVERRIDE; virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; diff --git a/chrome/browser/ui/login/login_prompt_ui.cc b/chrome/browser/ui/login/login_prompt_ui.cc index 154c869..95b2bf7 100644 --- a/chrome/browser/ui/login/login_prompt_ui.cc +++ b/chrome/browser/ui/login/login_prompt_ui.cc @@ -20,6 +20,7 @@ #include "chrome/common/jstemplate_builder.h" #include "chrome/common/url_constants.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/web_ui_message_handler.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -28,6 +29,7 @@ using content::BrowserThread; using content::WebContents; +using content::WebUIMessageHandler; class LoginHandlerSource : public ChromeURLDataManager::DataSource { public: diff --git a/chrome/browser/ui/views/html_dialog_view.cc b/chrome/browser/ui/views/html_dialog_view.cc index f0aedd9..9e2270b 100644 --- a/chrome/browser/ui/views/html_dialog_view.cc +++ b/chrome/browser/ui/views/html_dialog_view.cc @@ -27,6 +27,7 @@ class RenderWidgetHost; using content::WebContents; +using content::WebUIMessageHandler; namespace browser { diff --git a/chrome/browser/ui/views/html_dialog_view.h b/chrome/browser/ui/views/html_dialog_view.h index 9f651f3..f0909fb 100644 --- a/chrome/browser/ui/views/html_dialog_view.h +++ b/chrome/browser/ui/views/html_dialog_view.h @@ -69,7 +69,7 @@ class HtmlDialogView virtual string16 GetDialogTitle() const OVERRIDE; virtual GURL GetDialogContentURL() const OVERRIDE; virtual void GetWebUIMessageHandlers( - std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE; + std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; virtual std::string GetDialogArgs() const OVERRIDE; virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; diff --git a/chrome/browser/ui/views/keyboard_overlay_delegate.cc b/chrome/browser/ui/views/keyboard_overlay_delegate.cc index b877e38..1fe811d 100644 --- a/chrome/browser/ui/views/keyboard_overlay_delegate.cc +++ b/chrome/browser/ui/views/keyboard_overlay_delegate.cc @@ -17,6 +17,7 @@ #include "ui/gfx/screen.h" using content::WebContents; +using content::WebUIMessageHandler; static const int kBaseWidth = 1252; static const int kBaseHeight = 516; diff --git a/chrome/browser/ui/views/keyboard_overlay_delegate.h b/chrome/browser/ui/views/keyboard_overlay_delegate.h index 87e9606..e8de7b6 100644 --- a/chrome/browser/ui/views/keyboard_overlay_delegate.h +++ b/chrome/browser/ui/views/keyboard_overlay_delegate.h @@ -30,7 +30,7 @@ class KeyboardOverlayDelegate : public HtmlDialogUIDelegate { virtual string16 GetDialogTitle() const OVERRIDE; virtual GURL GetDialogContentURL() const OVERRIDE; virtual void GetWebUIMessageHandlers( - std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE; + std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; virtual std::string GetDialogArgs() const OVERRIDE; virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; diff --git a/chrome/browser/ui/webui/active_downloads_ui.cc b/chrome/browser/ui/webui/active_downloads_ui.cc index d067316..2ac5fa9 100644 --- a/chrome/browser/ui/webui/active_downloads_ui.cc +++ b/chrome/browser/ui/webui/active_downloads_ui.cc @@ -47,6 +47,7 @@ #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_ui_message_handler.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -56,6 +57,7 @@ #include "ui/base/resource/resource_bundle.h" using content::WebContents; +using content::WebUIMessageHandler; namespace { diff --git a/chrome/browser/ui/webui/aura/app_list_ui.cc b/chrome/browser/ui/webui/aura/app_list_ui.cc index 92adaa5..aa23be3 100644 --- a/chrome/browser/ui/webui/aura/app_list_ui.cc +++ b/chrome/browser/ui/webui/aura/app_list_ui.cc @@ -15,12 +15,14 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_ui_message_handler.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" using content::WebContents; +using content::WebUIMessageHandler; namespace { diff --git a/chrome/browser/ui/webui/bug_report_ui.cc b/chrome/browser/ui/webui/bug_report_ui.cc index 982b612..efe3141 100644 --- a/chrome/browser/ui/webui/bug_report_ui.cc +++ b/chrome/browser/ui/webui/bug_report_ui.cc @@ -30,6 +30,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_ui_message_handler.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -48,6 +49,7 @@ using content::BrowserThread; using content::WebContents; +using content::WebUIMessageHandler; namespace { diff --git a/chrome/browser/ui/webui/certificate_viewer_webui.cc b/chrome/browser/ui/webui/certificate_viewer_webui.cc index 33feee8..f2feab3 100644 --- a/chrome/browser/ui/webui/certificate_viewer_webui.cc +++ b/chrome/browser/ui/webui/certificate_viewer_webui.cc @@ -30,6 +30,7 @@ #endif using content::WebContents; +using content::WebUIMessageHandler; namespace { diff --git a/chrome/browser/ui/webui/certificate_viewer_webui.h b/chrome/browser/ui/webui/certificate_viewer_webui.h index 79038a8..a737759 100644 --- a/chrome/browser/ui/webui/certificate_viewer_webui.h +++ b/chrome/browser/ui/webui/certificate_viewer_webui.h @@ -9,6 +9,7 @@ #include "base/compiler_specific.h" #include "base/values.h" #include "chrome/browser/ui/webui/html_dialog_ui.h" +#include "content/public/browser/web_ui_message_handler.h" #include "net/base/x509_certificate.h" #include "ui/gfx/native_widget_types.h" @@ -42,7 +43,7 @@ class CertificateViewerDialog : private HtmlDialogUIDelegate { virtual string16 GetDialogTitle() const OVERRIDE; virtual GURL GetDialogContentURL() const OVERRIDE; virtual void GetWebUIMessageHandlers( - std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE; + std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; virtual std::string GetDialogArgs() const OVERRIDE; virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; @@ -64,7 +65,7 @@ class CertificateViewerDialog : private HtmlDialogUIDelegate { // Dialog handler which handles calls from the JS WebUI code to view certificate // details and export the certificate. -class CertificateViewerDialogHandler : public WebUIMessageHandler { +class CertificateViewerDialogHandler : public content::WebUIMessageHandler { public: CertificateViewerDialogHandler(gfx::NativeWindow window, net::X509Certificate* cert); 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 fd7cff1..5dd019e 100644 --- a/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc +++ b/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc @@ -22,12 +22,14 @@ #include "chrome/common/url_constants.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_ui_message_handler.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" using content::WebContents; +using content::WebUIMessageHandler; namespace chromeos { diff --git a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc index bad5249..57af80e 100644 --- a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc +++ b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc @@ -20,6 +20,7 @@ #include "chrome/common/jstemplate_builder.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" +#include "content/browser/webui/web_ui.h" #include "content/public/browser/browser_thread.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h b/chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h index 69a86e3..e197b67 100644 --- a/chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h +++ b/chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h @@ -20,6 +20,7 @@ #include "content/browser/tab_contents/tab_contents.h" #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" +#include "content/public/browser/web_ui_message_handler.h" #include "googleurl/src/gurl.h" using content::BrowserThread; @@ -69,7 +70,7 @@ class WebUIHandlerTaskProxy }; class WebUIHandler - : public WebUIMessageHandler, + : public content::WebUIMessageHandler, public chromeos::disks::DiskMountManager::Observer, public chromeos::BurnLibrary::Observer, public chromeos::NetworkLibrary::NetworkManagerObserver, diff --git a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc index 80ebefc..eb68517 100644 --- a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc +++ b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc @@ -19,6 +19,7 @@ #include "chrome/common/url_constants.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_ui_message_handler.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -26,6 +27,7 @@ using chromeos::input_method::ModifierKey; using content::WebContents; +using content::WebUIMessageHandler; namespace { diff --git a/chrome/browser/ui/webui/chromeos/login/base_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/base_screen_handler.cc index 619798c..eb11649 100644 --- a/chrome/browser/ui/webui/chromeos/login/base_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/base_screen_handler.cc @@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/chromeos/login/base_login_display_host.h" #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" #include "base/values.h" +#include "chrome/browser/chromeos/login/base_login_display_host.h" +#include "content/browser/webui/web_ui.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/chromeos/login/base_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/base_screen_handler.h index 83cfcab..51b4214 100644 --- a/chrome/browser/ui/webui/chromeos/login/base_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/base_screen_handler.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_BASE_SCREEN_HANDLER_H_ #pragma once -#include "content/browser/webui/web_ui.h" +#include "content/public/browser/web_ui_message_handler.h" #include "ui/gfx/native_widget_types.h" namespace base { @@ -16,7 +16,7 @@ class DictionaryValue; namespace chromeos { // Base class for the OOBE/Login WebUI handlers. -class BaseScreenHandler : public WebUIMessageHandler { +class BaseScreenHandler : public content::WebUIMessageHandler { public: BaseScreenHandler(); virtual ~BaseScreenHandler(); diff --git a/chrome/browser/ui/webui/chromeos/login/update_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/update_screen_handler.cc index aba57d5..5e7e2bc 100644 --- a/chrome/browser/ui/webui/chromeos/login/update_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/update_screen_handler.cc @@ -8,6 +8,7 @@ #include "base/bind_helpers.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" +#include "content/browser/webui/web_ui.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc index 263171f..0f047f5 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc @@ -19,6 +19,7 @@ using content::BrowserThread; using content::WebContents; +using content::WebUIMessageHandler; class MobileSetupDialogDelegate : public HtmlDialogUIDelegate { public: diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc index 7cd7fe2..35d7a10 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc @@ -36,6 +36,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_view_host_observer.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_ui_message_handler.h" #include "googleurl/src/gurl.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" @@ -46,6 +47,7 @@ using content::BrowserThread; using content::WebContents; +using content::WebUIMessageHandler; namespace { diff --git a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc index 6995937..c070eb0 100644 --- a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc +++ b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc @@ -16,10 +16,12 @@ #include "chrome/common/jstemplate_builder.h" #include "chrome/common/url_constants.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_ui_message_handler.h" #include "grit/browser_resources.h" #include "ui/base/resource/resource_bundle.h" using content::WebContents; +using content::WebUIMessageHandler; namespace { diff --git a/chrome/browser/ui/webui/chromeos/register_page_ui.cc b/chrome/browser/ui/webui/chromeos/register_page_ui.cc index 588259e..16f2fd4 100644 --- a/chrome/browser/ui/webui/chromeos/register_page_ui.cc +++ b/chrome/browser/ui/webui/chromeos/register_page_ui.cc @@ -26,11 +26,13 @@ #include "chrome/common/url_constants.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_ui_message_handler.h" #include "googleurl/src/gurl.h" #include "grit/browser_resources.h" #include "ui/base/resource/resource_bundle.h" using content::WebContents; +using content::WebUIMessageHandler; namespace { diff --git a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc index 1a803d7..5fffe31 100644 --- a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc +++ b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc @@ -24,6 +24,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_ui_message_handler.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -31,6 +32,7 @@ using content::BrowserThread; using content::WebContents; +using content::WebUIMessageHandler; namespace { diff --git a/chrome/browser/ui/webui/chromeos/system_info_ui.cc b/chrome/browser/ui/webui/chromeos/system_info_ui.cc index 5265f62..8159ca7 100644 --- a/chrome/browser/ui/webui/chromeos/system_info_ui.cc +++ b/chrome/browser/ui/webui/chromeos/system_info_ui.cc @@ -24,6 +24,7 @@ #include "chrome/common/url_constants.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_ui_message_handler.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -34,6 +35,7 @@ #include "ui/base/resource/resource_bundle.h" using content::WebContents; +using content::WebUIMessageHandler; class SystemInfoUIHTMLSource : public ChromeURLDataManager::DataSource { public: diff --git a/chrome/browser/ui/webui/cloud_print_signin_dialog.cc b/chrome/browser/ui/webui/cloud_print_signin_dialog.cc index 9fed8e2..1d2dca7 100644 --- a/chrome/browser/ui/webui/cloud_print_signin_dialog.cc +++ b/chrome/browser/ui/webui/cloud_print_signin_dialog.cc @@ -26,10 +26,12 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_ui_message_handler.h" using content::BrowserThread; using content::NavigationEntry; using content::WebContents; +using content::WebUIMessageHandler; // This module implements a sign in dialog for cloud print. // it is based heavily off "chrome/browser/printing/print_dialog_cloud.cc". diff --git a/chrome/browser/ui/webui/collected_cookies_ui_delegate.cc b/chrome/browser/ui/webui/collected_cookies_ui_delegate.cc index affcb87..0b1f853 100644 --- a/chrome/browser/ui/webui/collected_cookies_ui_delegate.cc +++ b/chrome/browser/ui/webui/collected_cookies_ui_delegate.cc @@ -30,6 +30,8 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/size.h" +using content::WebUIMessageHandler; + namespace { // TODO(xiyuan): Localize this. diff --git a/chrome/browser/ui/webui/collected_cookies_ui_delegate.h b/chrome/browser/ui/webui/collected_cookies_ui_delegate.h index 554b196..b43ad99 100644 --- a/chrome/browser/ui/webui/collected_cookies_ui_delegate.h +++ b/chrome/browser/ui/webui/collected_cookies_ui_delegate.h @@ -16,6 +16,7 @@ #include "chrome/common/content_settings.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "content/public/browser/web_ui_message_handler.h" class GURL; class TabContents; @@ -26,8 +27,8 @@ class Size; } class CollectedCookiesUIDelegate : public HtmlDialogUIDelegate, - WebUIMessageHandler, - content::NotificationObserver { + content::WebUIMessageHandler, + content::NotificationObserver { public: virtual ~CollectedCookiesUIDelegate(); @@ -39,7 +40,7 @@ class CollectedCookiesUIDelegate : public HtmlDialogUIDelegate, virtual string16 GetDialogTitle() const OVERRIDE; virtual GURL GetDialogContentURL() const OVERRIDE; virtual void GetWebUIMessageHandlers( - std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE; + std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; virtual std::string GetDialogArgs() const OVERRIDE; virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; diff --git a/chrome/browser/ui/webui/conflicts_ui.cc b/chrome/browser/ui/webui/conflicts_ui.cc index 29b6337..c56e521 100644 --- a/chrome/browser/ui/webui/conflicts_ui.cc +++ b/chrome/browser/ui/webui/conflicts_ui.cc @@ -24,6 +24,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_ui_message_handler.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -34,6 +35,7 @@ using content::UserMetricsAction; using content::WebContents; +using content::WebUIMessageHandler; namespace { diff --git a/chrome/browser/ui/webui/constrained_html_ui.cc b/chrome/browser/ui/webui/constrained_html_ui.cc index 5b13ad3..15e3613 100644 --- a/chrome/browser/ui/webui/constrained_html_ui.cc +++ b/chrome/browser/ui/webui/constrained_html_ui.cc @@ -19,6 +19,7 @@ #include "content/public/browser/web_contents.h" using content::WebContents; +using content::WebUIMessageHandler; static base::LazyInstance<base::PropertyAccessor<ConstrainedHtmlUIDelegate*> > g_constrained_html_ui_property_accessor = LAZY_INSTANCE_INITIALIZER; diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/crashes_ui.cc index f304b9e..2879ce2 100644 --- a/chrome/browser/ui/webui/crashes_ui.cc +++ b/chrome/browser/ui/webui/crashes_ui.cc @@ -22,6 +22,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_ui_message_handler.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -35,6 +36,7 @@ #endif using content::WebContents; +using content::WebUIMessageHandler; namespace { diff --git a/chrome/browser/ui/webui/downloads_dom_handler.cc b/chrome/browser/ui/webui/downloads_dom_handler.cc index 85be8f4..8898f98 100644 --- a/chrome/browser/ui/webui/downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/downloads_dom_handler.cc @@ -29,6 +29,7 @@ #include "chrome/browser/ui/webui/fileicon_source.h" #include "chrome/browser/ui/webui/fileicon_source_chromeos.h" #include "chrome/common/url_constants.h" +#include "content/browser/webui/web_ui.h" #include "content/public/browser/download_item.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/webui/downloads_dom_handler.h b/chrome/browser/ui/webui/downloads_dom_handler.h index b8a4788..d603094 100644 --- a/chrome/browser/ui/webui/downloads_dom_handler.h +++ b/chrome/browser/ui/webui/downloads_dom_handler.h @@ -9,9 +9,9 @@ #include <vector> #include "base/memory/scoped_ptr.h" -#include "content/browser/webui/web_ui.h" #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" +#include "content/public/browser/web_ui_message_handler.h" namespace base { class ListValue; @@ -19,7 +19,7 @@ class ListValue; // The handler for Javascript messages related to the "downloads" view, // also observes changes to the download manager. -class DownloadsDOMHandler : public WebUIMessageHandler, +class DownloadsDOMHandler : public content::WebUIMessageHandler, public content::DownloadManager::Observer, public content::DownloadItem::Observer { public: diff --git a/chrome/browser/ui/webui/edit_search_engine_dialog_webui.cc b/chrome/browser/ui/webui/edit_search_engine_dialog_webui.cc index d608b5a..d0357d5 100644 --- a/chrome/browser/ui/webui/edit_search_engine_dialog_webui.cc +++ b/chrome/browser/ui/webui/edit_search_engine_dialog_webui.cc @@ -19,12 +19,14 @@ #include "chrome/browser/ui/search_engines/edit_search_engine_controller.h" #include "chrome/browser/ui/webui/theme_source.h" #include "chrome/common/url_constants.h" +#include "content/browser/webui/web_ui.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" using content::WebContents; +using content::WebUIMessageHandler; namespace { const int kEditSearchEngineDialogWidth = 440; diff --git a/chrome/browser/ui/webui/edit_search_engine_dialog_webui.h b/chrome/browser/ui/webui/edit_search_engine_dialog_webui.h index 0c231a3..ef05581 100644 --- a/chrome/browser/ui/webui/edit_search_engine_dialog_webui.h +++ b/chrome/browser/ui/webui/edit_search_engine_dialog_webui.h @@ -11,6 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/webui/html_dialog_ui.h" +#include "content/public/browser/web_ui_message_handler.h" class EditSearchEngineController; class Profile; @@ -36,7 +37,7 @@ class EditSearchEngineDialogWebUI : private HtmlDialogUIDelegate { virtual string16 GetDialogTitle() const OVERRIDE; virtual GURL GetDialogContentURL() const OVERRIDE; virtual void GetWebUIMessageHandlers( - std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE; + std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; virtual std::string GetDialogArgs() const OVERRIDE; virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; @@ -53,7 +54,7 @@ class EditSearchEngineDialogWebUI : private HtmlDialogUIDelegate { // EditSearchEngineDialogHandlerWebUI is the message handling component of the // EditSearchEngineDialogWebUI. It handles messages from JavaScript, and it // handles the closing of the dialog. -class EditSearchEngineDialogHandlerWebUI : public WebUIMessageHandler { +class EditSearchEngineDialogHandlerWebUI : public content::WebUIMessageHandler { public: EditSearchEngineDialogHandlerWebUI(const TemplateURL* template_url, Profile* profile); diff --git a/chrome/browser/ui/webui/flags_ui.cc b/chrome/browser/ui/webui/flags_ui.cc index d4a1b79..0e7dab4 100644 --- a/chrome/browser/ui/webui/flags_ui.cc +++ b/chrome/browser/ui/webui/flags_ui.cc @@ -19,6 +19,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_ui_message_handler.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -33,6 +34,7 @@ #endif using content::WebContents; +using content::WebUIMessageHandler; namespace { diff --git a/chrome/browser/ui/webui/flash_ui.cc b/chrome/browser/ui/webui/flash_ui.cc index 6a4dc8f..ba88a3a 100644 --- a/chrome/browser/ui/webui/flash_ui.cc +++ b/chrome/browser/ui/webui/flash_ui.cc @@ -30,6 +30,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/plugin_service.h" #include "content/public/browser/user_metrics.h" +#include "content/public/browser/web_ui_message_handler.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -45,6 +46,7 @@ using content::PluginService; using content::UserMetricsAction; using content::WebContents; +using content::WebUIMessageHandler; namespace { diff --git a/chrome/browser/ui/webui/gpu_internals_ui.cc b/chrome/browser/ui/webui/gpu_internals_ui.cc index 6b4712b..2034b23 100644 --- a/chrome/browser/ui/webui/gpu_internals_ui.cc +++ b/chrome/browser/ui/webui/gpu_internals_ui.cc @@ -21,6 +21,7 @@ #include "content/browser/webui/web_ui.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_ui_message_handler.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "third_party/angle/src/common/version.h" @@ -28,6 +29,7 @@ using content::BrowserThread; using content::WebContents; +using content::WebUIMessageHandler; namespace { diff --git a/chrome/browser/ui/webui/history_ui.cc b/chrome/browser/ui/webui/history_ui.cc index e9c3b36..2147e61 100644 --- a/chrome/browser/ui/webui/history_ui.cc +++ b/chrome/browser/ui/webui/history_ui.cc @@ -30,6 +30,7 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" +#include "content/browser/webui/web_ui.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/user_metrics.h" diff --git a/chrome/browser/ui/webui/history_ui.h b/chrome/browser/ui/webui/history_ui.h index 3b13b8c..ec96ccb 100644 --- a/chrome/browser/ui/webui/history_ui.h +++ b/chrome/browser/ui/webui/history_ui.h @@ -14,11 +14,12 @@ #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/browser/ui/webui/chrome_web_ui.h" #include "content/public/browser/notification_registrar.h" +#include "content/public/browser/web_ui_message_handler.h" class GURL; // The handler for Javascript messages related to the "history" view. -class BrowsingHistoryHandler : public WebUIMessageHandler, +class BrowsingHistoryHandler : public content::WebUIMessageHandler, public content::NotificationObserver { public: BrowsingHistoryHandler(); diff --git a/chrome/browser/ui/webui/html_dialog_ui.cc b/chrome/browser/ui/webui/html_dialog_ui.cc index 7b1f6b6..8950d41 100644 --- a/chrome/browser/ui/webui/html_dialog_ui.cc +++ b/chrome/browser/ui/webui/html_dialog_ui.cc @@ -13,9 +13,11 @@ #include "content/browser/renderer_host/render_view_host.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_ui_message_handler.h" #include "content/public/common/bindings_policy.h" using content::WebContents; +using content::WebUIMessageHandler; static base::LazyInstance<base::PropertyAccessor<HtmlDialogUIDelegate*> > g_html_dialog_ui_property_accessor = LAZY_INSTANCE_INITIALIZER; diff --git a/chrome/browser/ui/webui/html_dialog_ui.h b/chrome/browser/ui/webui/html_dialog_ui.h index 104b5f3..f4216c4 100644 --- a/chrome/browser/ui/webui/html_dialog_ui.h +++ b/chrome/browser/ui/webui/html_dialog_ui.h @@ -46,7 +46,7 @@ class HtmlDialogUIDelegate { // is still open. Ownership of each handler is taken over by the WebUI // hosting the page. virtual void GetWebUIMessageHandlers( - std::vector<WebUIMessageHandler*>* handlers) const = 0; + std::vector<content::WebUIMessageHandler*>* handlers) const = 0; // Get the size of the dialog. virtual void GetDialogSize(gfx::Size* size) const = 0; diff --git a/chrome/browser/ui/webui/hung_renderer_dialog.cc b/chrome/browser/ui/webui/hung_renderer_dialog.cc index 224d7c3..8498e6f 100644 --- a/chrome/browser/ui/webui/hung_renderer_dialog.cc +++ b/chrome/browser/ui/webui/hung_renderer_dialog.cc @@ -23,11 +23,13 @@ #include "chrome/common/url_constants.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/webui/web_ui.h" #include "content/public/common/result_codes.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" using content::WebContents; +using content::WebUIMessageHandler; namespace { HungRendererDialog* g_instance = NULL; diff --git a/chrome/browser/ui/webui/hung_renderer_dialog.h b/chrome/browser/ui/webui/hung_renderer_dialog.h index b25419f..f71fcdc 100644 --- a/chrome/browser/ui/webui/hung_renderer_dialog.h +++ b/chrome/browser/ui/webui/hung_renderer_dialog.h @@ -14,6 +14,7 @@ #include "base/values.h" #include "chrome/browser/ui/webui/html_dialog_ui.h" #include "content/public/browser/web_contents_observer.h" +#include "content/public/browser/web_ui_message_handler.h" #include "ui/gfx/native_widget_types.h" class HungRendererDialogHandler; @@ -63,7 +64,7 @@ class HungRendererDialog : private HtmlDialogUIDelegate { virtual string16 GetDialogTitle() const OVERRIDE; virtual GURL GetDialogContentURL() const OVERRIDE; virtual void GetWebUIMessageHandlers( - std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE; + std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; virtual std::string GetDialogArgs() const OVERRIDE; virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; @@ -93,7 +94,7 @@ class HungRendererDialog : private HtmlDialogUIDelegate { // Dialog handler that handles calls from the JS WebUI code to get the details // of the list of frozen tabs. -class HungRendererDialogHandler : public WebUIMessageHandler { +class HungRendererDialogHandler : public content::WebUIMessageHandler { public: explicit HungRendererDialogHandler(content::WebContents* contents); diff --git a/chrome/browser/ui/webui/input_window_dialog_webui.cc b/chrome/browser/ui/webui/input_window_dialog_webui.cc index 9cd7c8c..40b8671 100644 --- a/chrome/browser/ui/webui/input_window_dialog_webui.cc +++ b/chrome/browser/ui/webui/input_window_dialog_webui.cc @@ -17,10 +17,12 @@ #include "chrome/browser/ui/webui/html_dialog_ui.h" #include "chrome/common/url_constants.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/webui/web_ui.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" using content::WebContents; +using content::WebUIMessageHandler; namespace { diff --git a/chrome/browser/ui/webui/input_window_dialog_webui.h b/chrome/browser/ui/webui/input_window_dialog_webui.h index ba13bff..0848a41 100644 --- a/chrome/browser/ui/webui/input_window_dialog_webui.h +++ b/chrome/browser/ui/webui/input_window_dialog_webui.h @@ -12,6 +12,7 @@ #include "base/string16.h" #include "chrome/browser/ui/input_window_dialog.h" #include "chrome/browser/ui/webui/html_dialog_ui.h" +#include "content/public/browser/web_ui_message_handler.h" namespace base { class ListValue; @@ -39,7 +40,7 @@ class InputWindowDialogWebUI : public InputWindowDialog, virtual string16 GetDialogTitle() const OVERRIDE; virtual GURL GetDialogContentURL() const OVERRIDE; virtual void GetWebUIMessageHandlers( - std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE; + std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; virtual std::string GetDialogArgs() const OVERRIDE; virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; @@ -62,7 +63,7 @@ class InputWindowDialogWebUI : public InputWindowDialog, // Dialog handler that handles calls from the JS WebUI code to validate the // string value in the text field. -class InputWindowDialogHandler : public WebUIMessageHandler { +class InputWindowDialogHandler : public content::WebUIMessageHandler { public: explicit InputWindowDialogHandler(InputWindowDialog::Delegate* delegate); diff --git a/chrome/browser/ui/webui/media/media_internals_handler.cc b/chrome/browser/ui/webui/media/media_internals_handler.cc index 6d9e346..86bf10c 100644 --- a/chrome/browser/ui/webui/media/media_internals_handler.cc +++ b/chrome/browser/ui/webui/media/media_internals_handler.cc @@ -10,8 +10,9 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/ui/webui/media/media_internals_proxy.h" #include "content/browser/renderer_host/render_view_host.h" -#include "content/public/browser/web_contents.h" +#include "content/browser/webui/web_ui.h" #include "content/public/browser/browser_thread.h" +#include "content/public/browser/web_contents.h" using content::BrowserThread; diff --git a/chrome/browser/ui/webui/media/media_internals_handler.h b/chrome/browser/ui/webui/media/media_internals_handler.h index 1f0e9b9..809b7c9 100644 --- a/chrome/browser/ui/webui/media/media_internals_handler.h +++ b/chrome/browser/ui/webui/media/media_internals_handler.h @@ -6,7 +6,9 @@ #define CHROME_BROWSER_UI_WEBUI_MEDIA_MEDIA_INTERNALS_HANDLER_H_ #pragma once -#include "chrome/browser/ui/webui/chrome_web_ui.h" +#include "base/compiler_specific.h" +#include "base/memory/ref_counted.h" +#include "content/public/browser/web_ui_message_handler.h" class MediaInternalsProxy; @@ -16,7 +18,7 @@ class ListValue; // This class handles messages to and from MediaInternalsUI. // It does all its work on the IO thread through the proxy below. -class MediaInternalsMessageHandler : public WebUIMessageHandler { +class MediaInternalsMessageHandler : public content::WebUIMessageHandler { public: MediaInternalsMessageHandler(); virtual ~MediaInternalsMessageHandler(); diff --git a/chrome/browser/ui/webui/media/media_internals_proxy.cc b/chrome/browser/ui/webui/media/media_internals_proxy.cc index 5ee0eeb..8cdec7e 100644 --- a/chrome/browser/ui/webui/media/media_internals_proxy.cc +++ b/chrome/browser/ui/webui/media/media_internals_proxy.cc @@ -9,6 +9,7 @@ #include "chrome/browser/io_thread.h" #include "chrome/browser/media/media_internals.h" #include "chrome/browser/ui/webui/media/media_internals_handler.h" +#include "content/browser/webui/web_ui.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/render_process_host.h" diff --git a/chrome/browser/ui/webui/metrics_handler.cc b/chrome/browser/ui/webui/metrics_handler.cc index 5465a0e..5703f38 100644 --- a/chrome/browser/ui/webui/metrics_handler.cc +++ b/chrome/browser/ui/webui/metrics_handler.cc @@ -13,6 +13,7 @@ #include "chrome/browser/metrics/metric_event_duration_details.h" #include "chrome/browser/ui/webui/chrome_web_ui.h" #include "chrome/common/chrome_notification_types.h" +#include "content/browser/webui/web_ui.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/webui/metrics_handler.h b/chrome/browser/ui/webui/metrics_handler.h index 2f6c693..2a465c7 100644 --- a/chrome/browser/ui/webui/metrics_handler.h +++ b/chrome/browser/ui/webui/metrics_handler.h @@ -5,7 +5,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_METRICS_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_METRICS_HANDLER_H_ -#include "content/browser/webui/web_ui.h" +#include "base/compiler_specific.h" +#include "content/public/browser/web_ui_message_handler.h" /////////////////////////////////////////////////////////////////////////////// // MetricsHandler @@ -21,7 +22,7 @@ namespace base { class ListValue; } -class MetricsHandler : public WebUIMessageHandler { +class MetricsHandler : public content::WebUIMessageHandler { public: MetricsHandler(); virtual ~MetricsHandler(); diff --git a/chrome/browser/ui/webui/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals_ui.cc index 2fdc19e..dc0b206 100644 --- a/chrome/browser/ui/webui/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals_ui.cc @@ -43,6 +43,7 @@ #include "chrome/common/url_constants.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" +#include "content/public/browser/web_ui_message_handler.h" #include "grit/generated_resources.h" #include "grit/net_internals_resources.h" #include "net/base/escape.h" @@ -75,6 +76,7 @@ using content::BrowserThread; using content::WebContents; +using content::WebUIMessageHandler; namespace { diff --git a/chrome/browser/ui/webui/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals_ui_browsertest.cc index d1af10f..bf25c4c 100644 --- a/chrome/browser/ui/webui/net_internals_ui_browsertest.cc +++ b/chrome/browser/ui/webui/net_internals_ui_browsertest.cc @@ -20,6 +20,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/web_ui_message_handler.h" #include "content/test/test_browser_thread.h" #include "googleurl/src/gurl.h" #include "net/base/address_list.h" @@ -33,6 +34,7 @@ #include "testing/gtest/include/gtest/gtest.h" using content::BrowserThread; +using content::WebUIMessageHandler; namespace { diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc index a299db3..f48510f 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc @@ -42,6 +42,7 @@ #include "chrome/common/url_constants.h" #include "chrome/common/web_apps.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/webui/web_ui.h" #include "content/public/browser/notification_service.h" #include "googleurl/src/gurl.h" #include "grit/browser_resources.h" diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.h b/chrome/browser/ui/webui/ntp/app_launcher_handler.h index 6bee678..4f32ad9 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.h +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.h @@ -17,9 +17,9 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/string_ordinal.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/web_ui_message_handler.h" class AppNotification; class ExtensionService; @@ -27,7 +27,7 @@ class PrefChangeRegistrar; class Profile; // The handler for Javascript messages related to the "apps" view. -class AppLauncherHandler : public WebUIMessageHandler, +class AppLauncherHandler : public content::WebUIMessageHandler, public ExtensionUninstallDialog::Delegate, public ExtensionInstallUI::Delegate, public content::NotificationObserver { diff --git a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc index de33951..d1f4ef0 100644 --- a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc +++ b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc @@ -16,6 +16,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/extension_resource.h" #include "chrome/common/url_constants.h" +#include "content/browser/webui/web_ui.h" #include "grit/ui_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/ntp/favicon_webui_handler.h b/chrome/browser/ui/webui/ntp/favicon_webui_handler.h index a35d1d8..aea2a4f 100644 --- a/chrome/browser/ui/webui/ntp/favicon_webui_handler.h +++ b/chrome/browser/ui/webui/ntp/favicon_webui_handler.h @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "chrome/browser/favicon/favicon_service.h" -#include "content/browser/webui/web_ui.h" +#include "content/public/browser/web_ui_message_handler.h" class ExtensionIconColorManager; @@ -20,7 +20,7 @@ namespace base { class ListValue; } -class FaviconWebUIHandler : public WebUIMessageHandler { +class FaviconWebUIHandler : public content::WebUIMessageHandler { public: FaviconWebUIHandler(); virtual ~FaviconWebUIHandler(); diff --git a/chrome/browser/ui/webui/ntp/foreign_session_handler.cc b/chrome/browser/ui/webui/ntp/foreign_session_handler.cc index f585889..8fc454f 100644 --- a/chrome/browser/ui/webui/ntp/foreign_session_handler.cc +++ b/chrome/browser/ui/webui/ntp/foreign_session_handler.cc @@ -19,6 +19,7 @@ #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/url_constants.h" +#include "content/browser/webui/web_ui.h" #include "content/public/browser/notification_source.h" namespace browser_sync { diff --git a/chrome/browser/ui/webui/ntp/foreign_session_handler.h b/chrome/browser/ui/webui/ntp/foreign_session_handler.h index c052568..4f82316 100644 --- a/chrome/browser/ui/webui/ntp/foreign_session_handler.h +++ b/chrome/browser/ui/webui/ntp/foreign_session_handler.h @@ -10,13 +10,13 @@ #include "chrome/browser/sessions/session_service.h" #include "chrome/browser/sync/glue/session_model_associator.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/web_ui_message_handler.h" namespace browser_sync { -class ForeignSessionHandler : public WebUIMessageHandler, +class ForeignSessionHandler : public content::WebUIMessageHandler, public content::NotificationObserver { public: // WebUIMessageHandler implementation. diff --git a/chrome/browser/ui/webui/ntp/most_visited_handler.cc b/chrome/browser/ui/webui/ntp/most_visited_handler.cc index 40aef5f..568edb8 100644 --- a/chrome/browser/ui/webui/ntp/most_visited_handler.cc +++ b/chrome/browser/ui/webui/ntp/most_visited_handler.cc @@ -30,6 +30,7 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "content/browser/webui/web_ui.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/user_metrics.h" diff --git a/chrome/browser/ui/webui/ntp/most_visited_handler.h b/chrome/browser/ui/webui/ntp/most_visited_handler.h index 03699e6..e48ba4b 100644 --- a/chrome/browser/ui/webui/ntp/most_visited_handler.h +++ b/chrome/browser/ui/webui/ntp/most_visited_handler.h @@ -11,9 +11,9 @@ #include "chrome/browser/cancelable_request.h" #include "chrome/browser/history/history_types.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/web_ui_message_handler.h" class GURL; class PageUsageData; @@ -30,7 +30,7 @@ class Value; // - The URL blacklist: URLs we do not want to show in the thumbnails list. It // is a dictionary for quick access (it associates a dummy boolean to the URL // string). -class MostVisitedHandler : public WebUIMessageHandler, +class MostVisitedHandler : public content::WebUIMessageHandler, public content::NotificationObserver { public: diff --git a/chrome/browser/ui/webui/ntp/new_tab_page_handler.cc b/chrome/browser/ui/webui/ntp/new_tab_page_handler.cc index 0a12131..0b67ec7 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_page_handler.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_page_handler.cc @@ -17,6 +17,7 @@ #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" #include "chrome/browser/web_resource/notification_promo.h" #include "chrome/common/pref_names.h" +#include "content/browser/webui/web_ui.h" #include "content/public/browser/notification_service.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/ntp/new_tab_page_handler.h b/chrome/browser/ui/webui/ntp/new_tab_page_handler.h index c61c820..34147f9 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_page_handler.h +++ b/chrome/browser/ui/webui/ntp/new_tab_page_handler.h @@ -7,14 +7,14 @@ #include "base/values.h" #include "chrome/common/chrome_notification_types.h" -#include "content/browser/webui/web_ui.h" +#include "content/public/browser/web_ui_message_handler.h" class PrefService; class Profile; // Handler for general New Tab Page functionality that does not belong in a // more specialized handler. -class NewTabPageHandler : public WebUIMessageHandler { +class NewTabPageHandler : public content::WebUIMessageHandler { public: NewTabPageHandler(); virtual ~NewTabPageHandler(); diff --git a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc index 5b29e0a..eeeb92f 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc @@ -17,6 +17,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/webui/web_ui.h" #include "grit/generated_resources.h" #include "net/base/cookie_monster.h" #include "net/url_request/url_request_context.h" diff --git a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h index 84864a0..f961ada 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h +++ b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h @@ -10,7 +10,7 @@ #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/sync_ui_util.h" -#include "content/browser/webui/web_ui.h" +#include "content/public/browser/web_ui_message_handler.h" namespace base { class ListValue; @@ -18,7 +18,7 @@ class ListValue; // Sends sync-state changes to the New Tab Page for UI updating and forwards // link clicks on the page to the sync service. -class NewTabPageSyncHandler : public WebUIMessageHandler, +class NewTabPageSyncHandler : public content::WebUIMessageHandler, public ProfileSyncServiceObserver { public: NewTabPageSyncHandler(); diff --git a/chrome/browser/ui/webui/ntp/ntp_login_handler.cc b/chrome/browser/ui/webui/ntp/ntp_login_handler.cc index 9487651..c898337 100644 --- a/chrome/browser/ui/webui/ntp/ntp_login_handler.cc +++ b/chrome/browser/ui/webui/ntp/ntp_login_handler.cc @@ -31,6 +31,7 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "content/browser/webui/web_ui.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/webui/ntp/ntp_login_handler.h b/chrome/browser/ui/webui/ntp/ntp_login_handler.h index 4cb6d42..ef79c9a 100644 --- a/chrome/browser/ui/webui/ntp/ntp_login_handler.h +++ b/chrome/browser/ui/webui/ntp/ntp_login_handler.h @@ -7,16 +7,16 @@ #pragma once #include "chrome/browser/prefs/pref_member.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/web_ui_message_handler.h" class Profile; // The NTP login handler currently simply displays the current logged in // username at the top of the NTP (and update itself when that changes). // In the future it may expand to allow users to login from the NTP. -class NTPLoginHandler : public WebUIMessageHandler, +class NTPLoginHandler : public content::WebUIMessageHandler, public content::NotificationObserver { public: NTPLoginHandler(); diff --git a/chrome/browser/ui/webui/ntp/recently_closed_tabs_handler.cc b/chrome/browser/ui/webui/ntp/recently_closed_tabs_handler.cc index 999b18a..32b2b15 100644 --- a/chrome/browser/ui/webui/ntp/recently_closed_tabs_handler.cc +++ b/chrome/browser/ui/webui/ntp/recently_closed_tabs_handler.cc @@ -13,6 +13,7 @@ #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" #include "chrome/browser/ui/webui/web_ui_util.h" #include "chrome/common/url_constants.h" +#include "content/browser/webui/web_ui.h" #include "content/public/browser/web_contents.h" namespace { diff --git a/chrome/browser/ui/webui/ntp/recently_closed_tabs_handler.h b/chrome/browser/ui/webui/ntp/recently_closed_tabs_handler.h index 79bcdee..65ee309 100644 --- a/chrome/browser/ui/webui/ntp/recently_closed_tabs_handler.h +++ b/chrome/browser/ui/webui/ntp/recently_closed_tabs_handler.h @@ -8,11 +8,11 @@ #include "base/values.h" #include "chrome/browser/sessions/tab_restore_service.h" #include "chrome/browser/sessions/tab_restore_service_observer.h" -#include "content/browser/webui/web_ui.h" +#include "content/public/browser/web_ui_message_handler.h" class TabRestoreService; -class RecentlyClosedTabsHandler : public WebUIMessageHandler, +class RecentlyClosedTabsHandler : public content::WebUIMessageHandler, public TabRestoreServiceObserver { public: RecentlyClosedTabsHandler() : tab_restore_service_(NULL) {} diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc index 881e1dc..60d0680 100644 --- a/chrome/browser/ui/webui/options/options_ui.cc +++ b/chrome/browser/ui/webui/options/options_ui.cc @@ -84,6 +84,7 @@ using content::UserMetricsAction; using content::WebContents; +using content::WebUIMessageHandler; static const char kLocalizedStringsFile[] = "strings.js"; static const char kOptionsBundleJsFile[] = "options_bundle.js"; diff --git a/chrome/browser/ui/webui/options/options_ui.h b/chrome/browser/ui/webui/options/options_ui.h index 7750da1..3269fa9 100644 --- a/chrome/browser/ui/webui/options/options_ui.h +++ b/chrome/browser/ui/webui/options/options_ui.h @@ -15,9 +15,10 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_types.h" +#include "content/public/browser/web_ui_message_handler.h" // The base class handler of Javascript messages of options pages. -class OptionsPageUIHandler : public WebUIMessageHandler, +class OptionsPageUIHandler : public content::WebUIMessageHandler, public content::NotificationObserver { public: OptionsPageUIHandler(); diff --git a/chrome/browser/ui/webui/options2/options_ui2.cc b/chrome/browser/ui/webui/options2/options_ui2.cc index 9a73fdb..5467d96 100644 --- a/chrome/browser/ui/webui/options2/options_ui2.cc +++ b/chrome/browser/ui/webui/options2/options_ui2.cc @@ -80,6 +80,7 @@ #endif using content::WebContents; +using content::WebUIMessageHandler; namespace options2 { diff --git a/chrome/browser/ui/webui/options2/options_ui2.h b/chrome/browser/ui/webui/options2/options_ui2.h index 1a2dc20..c4df1d1 100644 --- a/chrome/browser/ui/webui/options2/options_ui2.h +++ b/chrome/browser/ui/webui/options2/options_ui2.h @@ -15,12 +15,13 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_types.h" +#include "content/public/browser/web_ui_message_handler.h" namespace options2 { // The base class handler of Javascript messages of options pages. -class OptionsPageUIHandler : public WebUIMessageHandler, - public content::NotificationObserver { +class OptionsPageUIHandler : public content::WebUIMessageHandler, + public content::NotificationObserver { public: OptionsPageUIHandler(); virtual ~OptionsPageUIHandler(); diff --git a/chrome/browser/ui/webui/plugins_ui.cc b/chrome/browser/ui/webui/plugins_ui.cc index dcfcbea..7b7895f 100644 --- a/chrome/browser/ui/webui/plugins_ui.cc +++ b/chrome/browser/ui/webui/plugins_ui.cc @@ -32,6 +32,7 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/plugin_service.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_ui_message_handler.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" @@ -42,6 +43,7 @@ using content::PluginService; using content::WebContents; +using content::WebUIMessageHandler; using webkit::npapi::PluginGroup; using webkit::WebPluginInfo; diff --git a/chrome/browser/ui/webui/policy_ui.cc b/chrome/browser/ui/webui/policy_ui.cc index e331d7a..20986f9 100644 --- a/chrome/browser/ui/webui/policy_ui.cc +++ b/chrome/browser/ui/webui/policy_ui.cc @@ -18,6 +18,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" +#include "content/browser/webui/web_ui.h" #include "content/public/browser/web_contents.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/policy_ui.h b/chrome/browser/ui/webui/policy_ui.h index 54e82e6..044d909 100644 --- a/chrome/browser/ui/webui/policy_ui.h +++ b/chrome/browser/ui/webui/policy_ui.h @@ -11,13 +11,14 @@ #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/public/browser/web_ui_message_handler.h" namespace policy { class CloudPolicyDataStore; } // The base class handler of Javascript messages of the about:policy page. -class PolicyUIHandler : public WebUIMessageHandler, +class PolicyUIHandler : public content::WebUIMessageHandler, public policy::PolicyStatus::Observer { public: PolicyUIHandler(); diff --git a/chrome/browser/ui/webui/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview_handler.cc index 0ef9a12..c81ea3b 100644 --- a/chrome/browser/ui/webui/print_preview_handler.cc +++ b/chrome/browser/ui/webui/print_preview_handler.cc @@ -43,6 +43,7 @@ #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_view_host_delegate.h" #include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/webui/web_ui.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/webui/print_preview_handler.h b/chrome/browser/ui/webui/print_preview_handler.h index 3874647..48d932db 100644 --- a/chrome/browser/ui/webui/print_preview_handler.h +++ b/chrome/browser/ui/webui/print_preview_handler.h @@ -8,13 +8,14 @@ #include <string> +#include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "build/build_config.h" #include "chrome/browser/printing/print_view_manager_observer.h" #include "chrome/browser/ui/select_file_dialog.h" -#include "content/browser/webui/web_ui.h" +#include "content/public/browser/web_ui_message_handler.h" #include "printing/print_job_constants.h" class FilePath; @@ -32,7 +33,7 @@ class PrintBackend; } // The handler for Javascript messages related to the print preview dialog. -class PrintPreviewHandler : public WebUIMessageHandler, +class PrintPreviewHandler : public content::WebUIMessageHandler, public base::SupportsWeakPtr<PrintPreviewHandler>, public SelectFileDialog::Listener, public printing::PrintViewManagerObserver { diff --git a/chrome/browser/ui/webui/profiler_ui.cc b/chrome/browser/ui/webui/profiler_ui.cc index 6502aed..0c08b60 100644 --- a/chrome/browser/ui/webui/profiler_ui.cc +++ b/chrome/browser/ui/webui/profiler_ui.cc @@ -22,6 +22,7 @@ #include "content/browser/trace_controller.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_ui_message_handler.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" @@ -35,6 +36,7 @@ using chrome_browser_metrics::TrackingSynchronizer; using content::BrowserThread; using content::WebContents; +using content::WebUIMessageHandler; namespace { diff --git a/chrome/browser/ui/webui/quota_internals_handler.cc b/chrome/browser/ui/webui/quota_internals_handler.cc index 2c68c5d..d91397b 100644 --- a/chrome/browser/ui/webui/quota_internals_handler.cc +++ b/chrome/browser/ui/webui/quota_internals_handler.cc @@ -12,6 +12,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/quota_internals_proxy.h" #include "chrome/browser/ui/webui/quota_internals_types.h" +#include "content/browser/webui/web_ui.h" #include "net/base/net_util.h" namespace quota_internals { diff --git a/chrome/browser/ui/webui/quota_internals_handler.h b/chrome/browser/ui/webui/quota_internals_handler.h index ec050a6..7f002ed 100644 --- a/chrome/browser/ui/webui/quota_internals_handler.h +++ b/chrome/browser/ui/webui/quota_internals_handler.h @@ -11,7 +11,7 @@ #include <vector> #include "base/memory/ref_counted.h" -#include "content/browser/webui/web_ui.h" +#include "content/public/browser/web_ui_message_handler.h" #include "webkit/quota/quota_types.h" namespace base { @@ -29,7 +29,7 @@ typedef std::map<std::string, std::string> Statistics; // This class handles message from WebUI page of chrome://quota-internals/. // All methods in this class should be called on UI thread. -class QuotaInternalsHandler : public WebUIMessageHandler { +class QuotaInternalsHandler : public content::WebUIMessageHandler { public: QuotaInternalsHandler(); virtual ~QuotaInternalsHandler(); diff --git a/chrome/browser/ui/webui/sessions_ui.cc b/chrome/browser/ui/webui/sessions_ui.cc index 16cca51..5ac2eef 100644 --- a/chrome/browser/ui/webui/sessions_ui.cc +++ b/chrome/browser/ui/webui/sessions_ui.cc @@ -20,6 +20,7 @@ #include "chrome/common/url_constants.h" #include "content/browser/webui/web_ui.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_ui_message_handler.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -29,6 +30,7 @@ #include "ui/base/resource/resource_bundle.h" using content::WebContents; +using content::WebUIMessageHandler; namespace { 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 7cedfaf..ba285aa 100644 --- a/chrome/browser/ui/webui/ssl_client_certificate_selector_webui.cc +++ b/chrome/browser/ui/webui/ssl_client_certificate_selector_webui.cc @@ -28,6 +28,7 @@ #include "ui/gfx/size.h" using content::WebContents; +using content::WebUIMessageHandler; namespace { diff --git a/chrome/browser/ui/webui/ssl_client_certificate_selector_webui.h b/chrome/browser/ui/webui/ssl_client_certificate_selector_webui.h index 2ff7909..c7b7a25 100644 --- a/chrome/browser/ui/webui/ssl_client_certificate_selector_webui.h +++ b/chrome/browser/ui/webui/ssl_client_certificate_selector_webui.h @@ -12,11 +12,12 @@ #include "chrome/browser/ui/webui/html_dialog_ui.h" #include "net/base/ssl_cert_request_info.h" #include "content/browser/ssl/ssl_client_auth_handler.h" +#include "content/public/browser/web_ui_message_handler.h" class TabContentsWrapper; class SSLClientCertificateSelectorWebUI : public HtmlDialogUIDelegate, - WebUIMessageHandler { + content::WebUIMessageHandler { public: // Static factory method. static void ShowDialog( @@ -38,7 +39,7 @@ class SSLClientCertificateSelectorWebUI : public HtmlDialogUIDelegate, virtual string16 GetDialogTitle() const OVERRIDE; virtual GURL GetDialogContentURL() const OVERRIDE; virtual void GetWebUIMessageHandlers( - std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE; + std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; virtual std::string GetDialogArgs() const OVERRIDE; virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; diff --git a/chrome/browser/ui/webui/tab_modal_confirm_dialog_webui.cc b/chrome/browser/ui/webui/tab_modal_confirm_dialog_webui.cc index f26f23f..38deeb9 100644 --- a/chrome/browser/ui/webui/tab_modal_confirm_dialog_webui.cc +++ b/chrome/browser/ui/webui/tab_modal_confirm_dialog_webui.cc @@ -30,6 +30,7 @@ #include "ui/gfx/size.h" using content::WebContents; +using content::WebUIMessageHandler; namespace browser { diff --git a/chrome/browser/ui/webui/task_manager_dialog.cc b/chrome/browser/ui/webui/task_manager_dialog.cc index fdddc62..b22ee2d 100644 --- a/chrome/browser/ui/webui/task_manager_dialog.cc +++ b/chrome/browser/ui/webui/task_manager_dialog.cc @@ -27,6 +27,7 @@ using content::BrowserThread; using content::WebContents; +using content::WebUIMessageHandler; class TaskManagerDialogImpl : public HtmlDialogUIDelegate { public: diff --git a/chrome/browser/ui/webui/task_manager_handler.cc b/chrome/browser/ui/webui/task_manager_handler.cc index 4308692..8cca2b63 100644 --- a/chrome/browser/ui/webui/task_manager_handler.cc +++ b/chrome/browser/ui/webui/task_manager_handler.cc @@ -16,6 +16,7 @@ #include "chrome/common/chrome_notification_types.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_view_host_delegate.h" +#include "content/browser/webui/web_ui.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/webui/task_manager_handler.h b/chrome/browser/ui/webui/task_manager_handler.h index 6d03a0d..fbc0872 100644 --- a/chrome/browser/ui/webui/task_manager_handler.h +++ b/chrome/browser/ui/webui/task_manager_handler.h @@ -7,14 +7,14 @@ #pragma once #include <vector> -#include "content/browser/webui/web_ui.h" +#include "content/public/browser/web_ui_message_handler.h" #include "chrome/browser/task_manager/task_manager.h" namespace base { class ListValue; } -class TaskManagerHandler : public WebUIMessageHandler, +class TaskManagerHandler : public content::WebUIMessageHandler, public TaskManagerModelObserver { public: explicit TaskManagerHandler(TaskManager* tm); diff --git a/chrome/browser/ui/webui/test_html_dialog_ui_delegate.cc b/chrome/browser/ui/webui/test_html_dialog_ui_delegate.cc index 939e0aa..56875a6 100644 --- a/chrome/browser/ui/webui/test_html_dialog_ui_delegate.cc +++ b/chrome/browser/ui/webui/test_html_dialog_ui_delegate.cc @@ -7,6 +7,7 @@ #include "base/utf_string_conversions.h" using content::WebContents; +using content::WebUIMessageHandler; namespace test { diff --git a/chrome/browser/ui/webui/test_html_dialog_ui_delegate.h b/chrome/browser/ui/webui/test_html_dialog_ui_delegate.h index a4085a0..d19af4d 100644 --- a/chrome/browser/ui/webui/test_html_dialog_ui_delegate.h +++ b/chrome/browser/ui/webui/test_html_dialog_ui_delegate.h @@ -28,7 +28,7 @@ class TestHtmlDialogUIDelegate : public HtmlDialogUIDelegate { virtual string16 GetDialogTitle() const OVERRIDE; virtual GURL GetDialogContentURL() const OVERRIDE; virtual void GetWebUIMessageHandlers( - std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE; + std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; virtual std::string GetDialogArgs() const OVERRIDE; virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; diff --git a/chrome/browser/ui/webui/tracing_ui.cc b/chrome/browser/ui/webui/tracing_ui.cc index 3231eac..ea1bfdb 100644 --- a/chrome/browser/ui/webui/tracing_ui.cc +++ b/chrome/browser/ui/webui/tracing_ui.cc @@ -24,12 +24,14 @@ #include "content/browser/trace_controller.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" +#include "content/public/browser/web_ui_message_handler.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" using content::BrowserThread; using content::WebContents; +using content::WebUIMessageHandler; namespace { diff --git a/chrome/browser/ui/webui/web_ui_browsertest.cc b/chrome/browser/ui/webui/web_ui_browsertest.cc index 058d5c6..3a67dc3 100644 --- a/chrome/browser/ui/webui/web_ui_browsertest.cc +++ b/chrome/browser/ui/webui/web_ui_browsertest.cc @@ -23,11 +23,13 @@ #include "chrome/test/base/test_tab_strip_model_observer.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/web_ui_message_handler.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest-spi.h" #include "ui/base/resource/resource_bundle.h" using content::WebContents; +using content::WebUIMessageHandler; namespace { diff --git a/chrome/browser/ui/webui/web_ui_browsertest.h b/chrome/browser/ui/webui/web_ui_browsertest.h index 6d86ebc..1761bbb 100644 --- a/chrome/browser/ui/webui/web_ui_browsertest.h +++ b/chrome/browser/ui/webui/web_ui_browsertest.h @@ -16,12 +16,15 @@ #include "content/test/test_navigation_observer.h" class RenderViewHost; -class WebUIMessageHandler; namespace base { class Value; } +namespace content { +class WebUIMessageHandler; +} + // This macro simplifies the declaration of simple javascript unit tests. // Use: // WEB_UI_UNITTEST_F(MyWebUIPageTest, myJavascriptUnittest); @@ -134,7 +137,7 @@ class WebUIBrowserTest void SetWebUIInstance(WebUI* web_ui); // Returns a mock WebUI object under test (if any). - virtual WebUIMessageHandler* GetMockMessageHandler(); + virtual content::WebUIMessageHandler* GetMockMessageHandler(); // Returns a file:// GURL constructed from |path| inside the test data dir for // webui tests. diff --git a/chrome/browser/ui/webui/web_ui_test_handler.cc b/chrome/browser/ui/webui/web_ui_test_handler.cc index a5dc311..633ddce 100644 --- a/chrome/browser/ui/webui/web_ui_test_handler.cc +++ b/chrome/browser/ui/webui/web_ui_test_handler.cc @@ -11,6 +11,7 @@ #include "chrome/common/render_messages.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/webui/web_ui.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_types.h" diff --git a/chrome/browser/ui/webui/web_ui_test_handler.h b/chrome/browser/ui/webui/web_ui_test_handler.h index 0c46221..9356c75 100644 --- a/chrome/browser/ui/webui/web_ui_test_handler.h +++ b/chrome/browser/ui/webui/web_ui_test_handler.h @@ -6,18 +6,19 @@ #define CHROME_BROWSER_UI_WEBUI_WEB_UI_TEST_HANDLER_H_ #pragma once +#include "base/compiler_specific.h" #include "base/string16.h" -#include "content/browser/webui/web_ui.h" #include "content/public/browser/notification_observer.h" +#include "content/public/browser/web_ui_message_handler.h" -namespace base { +class RenderViewHost; +namespace base { class ListValue; - } // namespace base // This class registers test framework specific handlers on WebUI objects. -class WebUITestHandler : public WebUIMessageHandler, +class WebUITestHandler : public content::WebUIMessageHandler, public content::NotificationObserver { public: WebUITestHandler(); diff --git a/chrome/browser/ui/webui/workers_ui.cc b/chrome/browser/ui/webui/workers_ui.cc index c6250f5..8e72427 100644 --- a/chrome/browser/ui/webui/workers_ui.cc +++ b/chrome/browser/ui/webui/workers_ui.cc @@ -22,6 +22,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/worker_service.h" #include "content/public/browser/worker_service_observer.h" +#include "content/public/browser/web_ui_message_handler.h" #include "content/public/common/process_type.h" #include "grit/generated_resources.h" #include "grit/workers_resources.h" @@ -31,6 +32,7 @@ using content::BrowserThread; using content::DevToolsAgentHost; using content::DevToolsAgentHostRegistry; using content::WebContents; +using content::WebUIMessageHandler; using content::WorkerService; using content::WorkerServiceObserver; diff --git a/chrome/test/data/webui/async_gen.cc b/chrome/test/data/webui/async_gen.cc index d69fe6f..4219aff 100644 --- a/chrome/test/data/webui/async_gen.cc +++ b/chrome/test/data/webui/async_gen.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/values.h" +#include "content/browser/webui/web_ui.h" WebUIBrowserAsyncGenTest::WebUIBrowserAsyncGenTest() {} diff --git a/chrome/test/data/webui/async_gen.h b/chrome/test/data/webui/async_gen.h index 4bc70df..e2c65d2 100644 --- a/chrome/test/data/webui/async_gen.h +++ b/chrome/test/data/webui/async_gen.h @@ -6,6 +6,7 @@ #pragma once #include "chrome/browser/ui/webui/web_ui_browsertest.h" +#include "content/public/browser/web_ui_message_handler.h" #include "testing/gmock/include/gmock/gmock.h" namespace base { @@ -19,7 +20,7 @@ class WebUIBrowserAsyncGenTest : public WebUIBrowserTest { virtual ~WebUIBrowserAsyncGenTest(); protected: - class AsyncWebUIMessageHandler : public WebUIMessageHandler { + class AsyncWebUIMessageHandler : public content::WebUIMessageHandler { public: AsyncWebUIMessageHandler(); ~AsyncWebUIMessageHandler(); @@ -38,7 +39,7 @@ class WebUIBrowserAsyncGenTest : public WebUIBrowserTest { private: // Provide this object's handler. - virtual WebUIMessageHandler* GetMockMessageHandler() OVERRIDE { + virtual content::WebUIMessageHandler* GetMockMessageHandler() OVERRIDE { return &message_handler_; } diff --git a/chrome/test/data/webui/chrome_send_browsertest.cc b/chrome/test/data/webui/chrome_send_browsertest.cc index 0c29554..23de109 100644 --- a/chrome/test/data/webui/chrome_send_browsertest.cc +++ b/chrome/test/data/webui/chrome_send_browsertest.cc @@ -7,8 +7,11 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/values.h" +#include "content/browser/webui/web_ui.h" #include "testing/gmock/include/gmock/gmock.h" +using content::WebUIMessageHandler; + ChromeSendWebUITest::ChromeSendWebUITest() {} ChromeSendWebUITest::~ChromeSendWebUITest() {} diff --git a/chrome/test/data/webui/chrome_send_browsertest.h b/chrome/test/data/webui/chrome_send_browsertest.h index 0262a46..209d59b 100644 --- a/chrome/test/data/webui/chrome_send_browsertest.h +++ b/chrome/test/data/webui/chrome_send_browsertest.h @@ -16,7 +16,7 @@ class ChromeSendWebUITest : public WebUIBrowserTest { virtual ~ChromeSendWebUITest(); // Mocked message handler class to register expects using gmock framework. - class ChromeSendWebUIMessageHandler : public WebUIMessageHandler { + class ChromeSendWebUIMessageHandler : public content::WebUIMessageHandler { public: ChromeSendWebUIMessageHandler(); ~ChromeSendWebUIMessageHandler(); @@ -33,7 +33,7 @@ class ChromeSendWebUITest : public WebUIBrowserTest { ::testing::StrictMock<ChromeSendWebUIMessageHandler> message_handler_; private: - virtual WebUIMessageHandler* GetMockMessageHandler() OVERRIDE; + virtual content::WebUIMessageHandler* GetMockMessageHandler() OVERRIDE; DISALLOW_COPY_AND_ASSIGN(ChromeSendWebUITest); }; diff --git a/content/browser/webui/generic_handler.cc b/content/browser/webui/generic_handler.cc index 02c53dc..0ecff70 100644 --- a/content/browser/webui/generic_handler.cc +++ b/content/browser/webui/generic_handler.cc @@ -9,6 +9,7 @@ #include "base/logging.h" #include "base/values.h" #include "content/browser/disposition_utils.h" +#include "content/browser/webui/web_ui.h" #include "content/public/browser/web_contents.h" using content::OpenURLParams; diff --git a/content/browser/webui/generic_handler.h b/content/browser/webui/generic_handler.h index 1f57e4d..092d0549 100644 --- a/content/browser/webui/generic_handler.h +++ b/content/browser/webui/generic_handler.h @@ -6,14 +6,15 @@ #define CONTENT_BROWSER_WEBUI_GENERIC_HANDLER_H_ #pragma once -#include "content/browser/webui/web_ui.h" +#include "base/compiler_specific.h" +#include "content/public/browser/web_ui_message_handler.h" namespace base { class ListValue; } // A place to add handlers for messages shared across all WebUI pages. -class GenericHandler : public WebUIMessageHandler { +class GenericHandler : public content::WebUIMessageHandler { public: GenericHandler(); virtual ~GenericHandler(); diff --git a/content/browser/webui/web_ui.cc b/content/browser/webui/web_ui.cc index 5765dd0..1896e3c 100644 --- a/content/browser/webui/web_ui.cc +++ b/content/browser/webui/web_ui.cc @@ -4,10 +4,8 @@ #include "content/browser/webui/web_ui.h" -#include "base/i18n/rtl.h" #include "base/json/json_writer.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "content/browser/child_process_security_policy.h" @@ -18,10 +16,9 @@ #include "content/browser/webui/generic_handler.h" #include "content/common/view_messages.h" #include "content/public/common/bindings_policy.h" -#include "ipc/ipc_message.h" -#include "ipc/ipc_message_macros.h" using content::WebContents; +using content::WebUIMessageHandler; // static string16 WebUI::GetJavascriptCall( @@ -180,70 +177,3 @@ void WebUI::ExecuteJavascript(const string16& javascript) { web_contents_->GetRenderViewHost()->ExecuteJavascriptInWebFrame( ASCIIToUTF16(frame_xpath_), javascript); } - -/////////////////////////////////////////////////////////////////////////////// -// WebUIMessageHandler -WebUIMessageHandler::WebUIMessageHandler() : web_ui_(NULL) { -} - -WebUIMessageHandler::~WebUIMessageHandler() { -} - -// WebUIMessageHandler, protected: --------------------------------------------- - -void WebUIMessageHandler::SetURLAndTitle(DictionaryValue* dictionary, - string16 title, - const GURL& gurl) { - dictionary->SetString("url", gurl.spec()); - - bool using_url_as_the_title = false; - if (title.empty()) { - using_url_as_the_title = true; - title = UTF8ToUTF16(gurl.spec()); - } - - // Since the title can contain BiDi text, we need to mark the text as either - // RTL or LTR, depending on the characters in the string. If we use the URL - // as the title, we mark the title as LTR since URLs are always treated as - // left to right strings. - string16 title_to_set(title); - if (base::i18n::IsRTL()) { - if (using_url_as_the_title) { - base::i18n::WrapStringWithLTRFormatting(&title_to_set); - } else { - base::i18n::AdjustStringForLocaleDirection(&title_to_set); - } - } - dictionary->SetString("title", title_to_set); -} - -bool WebUIMessageHandler::ExtractIntegerValue(const ListValue* value, - int* out_int) { - std::string string_value; - if (value->GetString(0, &string_value)) - return base::StringToInt(string_value, out_int); - double double_value; - if (value->GetDouble(0, &double_value)) { - *out_int = static_cast<int>(double_value); - return true; - } - NOTREACHED(); - return false; -} - -bool WebUIMessageHandler::ExtractDoubleValue(const ListValue* value, - double* out_value) { - std::string string_value; - if (value->GetString(0, &string_value)) - return base::StringToDouble(string_value, out_value); - NOTREACHED(); - return false; -} - -string16 WebUIMessageHandler::ExtractStringValue(const ListValue* value) { - string16 string16_value; - if (value->GetString(0, &string16_value)) - return string16_value; - NOTREACHED(); - return string16(); -} diff --git a/content/browser/webui/web_ui.h b/content/browser/webui/web_ui.h index 497d3b4..c600f5ca 100644 --- a/content/browser/webui/web_ui.h +++ b/content/browser/webui/web_ui.h @@ -20,16 +20,15 @@ class GURL; class RenderViewHost; -class WebUIMessageHandler; namespace base { -class DictionaryValue; class ListValue; class Value; } namespace content { class WebContents; +class WebUIMessageHandler; } // A WebUI sets up the datasources and message handlers for a given HTML-based @@ -167,7 +166,7 @@ class CONTENT_EXPORT WebUI : public IPC::Channel::Listener { protected: // Takes ownership of |handler|, which will be destroyed when the WebUI is. - void AddMessageHandler(WebUIMessageHandler* handler); + void AddMessageHandler(content::WebUIMessageHandler* handler); // Execute a string of raw Javascript on the page. Overridable for // testing purposes. @@ -187,7 +186,7 @@ class CONTENT_EXPORT WebUI : public IPC::Channel::Listener { bool register_callback_overwrites_; // Defaults to false. // The WebUIMessageHandlers we own. - std::vector<WebUIMessageHandler*> handlers_; + std::vector<content::WebUIMessageHandler*> handlers_; // Non-owning pointer to the WebContents this WebUI is associated with. content::WebContents* web_contents_; @@ -204,50 +203,4 @@ class CONTENT_EXPORT WebUI : public IPC::Channel::Listener { DISALLOW_COPY_AND_ASSIGN(WebUI); }; -// Messages sent from the DOM are forwarded via the WebUI to handler -// classes. These objects are owned by WebUI and destroyed when the -// host is destroyed. -class CONTENT_EXPORT WebUIMessageHandler { - public: - WebUIMessageHandler(); - virtual ~WebUIMessageHandler(); - - protected: - // Helper methods: - - // Adds "url" and "title" keys on incoming dictionary, setting title - // as the url as a fallback on empty title. - static void SetURLAndTitle(base::DictionaryValue* dictionary, - string16 title, - const GURL& gurl); - - // Extract an integer value from a list Value. - static bool ExtractIntegerValue(const base::ListValue* value, int* out_int); - - // Extract a floating point (double) value from a list Value. - static bool ExtractDoubleValue(const base::ListValue* value, - double* out_value); - - // Extract a string value from a list Value. - static string16 ExtractStringValue(const base::ListValue* value); - - // This is where subclasses specify which messages they'd like to handle and - // perform any additional initialization.. At this point web_ui() will return - // the associated WebUI object. - virtual void RegisterMessages() = 0; - - // Returns the attached WebUI for this handler. - WebUI* web_ui() const { return web_ui_; } - - private: - friend class WebUI; - friend class WebUIBrowserTest; - - void set_web_ui(WebUI* web_ui) { web_ui_ = web_ui; } - - WebUI* web_ui_; - - DISALLOW_COPY_AND_ASSIGN(WebUIMessageHandler); -}; - #endif // CONTENT_BROWSER_WEBUI_WEB_UI_H_ diff --git a/content/browser/webui/web_ui_message_handler.cc b/content/browser/webui/web_ui_message_handler.cc new file mode 100644 index 0000000..8090e93 --- /dev/null +++ b/content/browser/webui/web_ui_message_handler.cc @@ -0,0 +1,73 @@ +// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "content/public/browser/web_ui_message_handler.h" + +#include "base/i18n/rtl.h" +#include "base/logging.h" +#include "base/values.h" +#include "base/string_number_conversions.h" +#include "base/utf_string_conversions.h" +#include "googleurl/src/gurl.h" + +namespace content { + +void WebUIMessageHandler::SetURLAndTitle(DictionaryValue* dictionary, + string16 title, + const GURL& gurl) { + dictionary->SetString("url", gurl.spec()); + + bool using_url_as_the_title = false; + if (title.empty()) { + using_url_as_the_title = true; + title = UTF8ToUTF16(gurl.spec()); + } + + // Since the title can contain BiDi text, we need to mark the text as either + // RTL or LTR, depending on the characters in the string. If we use the URL + // as the title, we mark the title as LTR since URLs are always treated as + // left to right strings. + string16 title_to_set(title); + if (base::i18n::IsRTL()) { + if (using_url_as_the_title) { + base::i18n::WrapStringWithLTRFormatting(&title_to_set); + } else { + base::i18n::AdjustStringForLocaleDirection(&title_to_set); + } + } + dictionary->SetString("title", title_to_set); +} + +bool WebUIMessageHandler::ExtractIntegerValue(const ListValue* value, + int* out_int) { + std::string string_value; + if (value->GetString(0, &string_value)) + return base::StringToInt(string_value, out_int); + double double_value; + if (value->GetDouble(0, &double_value)) { + *out_int = static_cast<int>(double_value); + return true; + } + NOTREACHED(); + return false; +} + +bool WebUIMessageHandler::ExtractDoubleValue(const ListValue* value, + double* out_value) { + std::string string_value; + if (value->GetString(0, &string_value)) + return base::StringToDouble(string_value, out_value); + NOTREACHED(); + return false; +} + +string16 WebUIMessageHandler::ExtractStringValue(const ListValue* value) { + string16 string16_value; + if (value->GetString(0, &string16_value)) + return string16_value; + NOTREACHED(); + return string16(); +} + +} // namespace content diff --git a/content/content_browser.gypi b/content/content_browser.gypi index b1a5ed8..75fde8e 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -85,6 +85,7 @@ 'public/browser/web_contents_observer.cc', 'public/browser/web_contents_observer.h', 'public/browser/web_intents_dispatcher.h', + 'public/browser/web_ui_message_handler.h', 'public/browser/worker_service.h', 'public/browser/worker_service_observer.h', 'browser/accessibility/browser_accessibility.cc', @@ -634,6 +635,7 @@ 'browser/webui/web_ui.h', 'browser/webui/web_ui_factory.cc', 'browser/webui/web_ui_factory.h', + 'browser/webui/web_ui_message_handler.cc', 'browser/worker_host/message_port_service.cc', 'browser/worker_host/message_port_service.h', 'browser/worker_host/worker_document_set.cc', diff --git a/content/public/browser/web_ui_message_handler.h b/content/public/browser/web_ui_message_handler.h new file mode 100644 index 0000000..9619d37 --- /dev/null +++ b/content/public/browser/web_ui_message_handler.h @@ -0,0 +1,73 @@ +// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CONTENT_PUBLIC_BROWSER_WEB_UI_MESSAGE_HANDLER_H_ +#define CONTENT_PUBLIC_BROWSER_WEB_UI_MESSAGE_HANDLER_H_ +#pragma once + +#include "base/basictypes.h" +#include "base/string16.h" +#include "content/common/content_export.h" + +class GURL; +class WebUI; +class WebUIBrowserTest; + +namespace base { +class DictionaryValue; +class ListValue; +} + +namespace content { + +// Messages sent from the DOM are forwarded via the WebUI to handler +// classes. These objects are owned by WebUI and destroyed when the +// host is destroyed. +class CONTENT_EXPORT WebUIMessageHandler { + public: + WebUIMessageHandler() : web_ui_(NULL) {} + virtual ~WebUIMessageHandler() {} + + protected: + // Helper methods: + + // Adds "url" and "title" keys on incoming dictionary, setting title + // as the url as a fallback on empty title. + static void SetURLAndTitle(base::DictionaryValue* dictionary, + string16 title, + const GURL& gurl); + + // Extract an integer value from a list Value. + static bool ExtractIntegerValue(const base::ListValue* value, int* out_int); + + // Extract a floating point (double) value from a list Value. + static bool ExtractDoubleValue(const base::ListValue* value, + double* out_value); + + // Extract a string value from a list Value. + static string16 ExtractStringValue(const base::ListValue* value); + + // This is where subclasses specify which messages they'd like to handle and + // perform any additional initialization.. At this point web_ui() will return + // the associated WebUI object. + virtual void RegisterMessages() = 0; + + // Returns the attached WebUI for this handler. + WebUI* web_ui() const { return web_ui_; } + + private: + friend class ::WebUI; + friend class ::WebUIBrowserTest; + + void set_web_ui(WebUI* web_ui) { web_ui_ = web_ui; } + + WebUI* web_ui_; + + DISALLOW_COPY_AND_ASSIGN(WebUIMessageHandler); +}; + +} // namespace content + +#endif // CONTENT_PUBLIC_BROWSER_WEB_UI_MESSAGE_HANDLER_H_ + |