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 /chrome/browser/chromeos | |
| 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
Diffstat (limited to 'chrome/browser/chromeos')
6 files changed, 6 insertions, 3 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; |