diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-27 06:07:20 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-27 06:07:20 +0000 |
| commit | ca9e62ec12f780451289c594df0a79e71684232a (patch) | |
| tree | 2f50eef80f193742d63e0d60bc252d600f2219cb /ui/web_dialogs | |
| parent | 4c413de038d8d3c29d9bfd6a55495c064a5c22ab (diff) | |
| download | chromium_src-ca9e62ec12f780451289c594df0a79e71684232a.zip chromium_src-ca9e62ec12f780451289c594df0a79e71684232a.tar.gz chromium_src-ca9e62ec12f780451289c594df0a79e71684232a.tar.bz2 | |
ui/web_dialogs: Use base::string16 now that string16 was moved into base namespace.
base/string16.h was moved into base namespace in r191198 by Brett.
BUG=None
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/16049004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202374 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/web_dialogs')
| -rw-r--r-- | ui/web_dialogs/test/test_web_dialog_delegate.cc | 2 | ||||
| -rw-r--r-- | ui/web_dialogs/test/test_web_dialog_delegate.h | 2 | ||||
| -rw-r--r-- | ui/web_dialogs/web_dialog_delegate.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ui/web_dialogs/test/test_web_dialog_delegate.cc b/ui/web_dialogs/test/test_web_dialog_delegate.cc index 81c4982..a75fd9e 100644 --- a/ui/web_dialogs/test/test_web_dialog_delegate.cc +++ b/ui/web_dialogs/test/test_web_dialog_delegate.cc @@ -24,7 +24,7 @@ ModalType TestWebDialogDelegate::GetDialogModalType() const { return MODAL_TYPE_WINDOW; } -string16 TestWebDialogDelegate::GetDialogTitle() const { +base::string16 TestWebDialogDelegate::GetDialogTitle() const { return UTF8ToUTF16("Test"); } diff --git a/ui/web_dialogs/test/test_web_dialog_delegate.h b/ui/web_dialogs/test/test_web_dialog_delegate.h index e90201f..b5488fb 100644 --- a/ui/web_dialogs/test/test_web_dialog_delegate.h +++ b/ui/web_dialogs/test/test_web_dialog_delegate.h @@ -26,7 +26,7 @@ class TestWebDialogDelegate : public WebDialogDelegate { // WebDialogDelegate implementation: virtual ModalType GetDialogModalType() const OVERRIDE; - virtual string16 GetDialogTitle() const OVERRIDE; + virtual base::string16 GetDialogTitle() const OVERRIDE; virtual GURL GetDialogContentURL() const OVERRIDE; virtual void GetWebUIMessageHandlers( std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE; diff --git a/ui/web_dialogs/web_dialog_delegate.h b/ui/web_dialogs/web_dialog_delegate.h index 3a6ec4f..8b8693c 100644 --- a/ui/web_dialogs/web_dialog_delegate.h +++ b/ui/web_dialogs/web_dialog_delegate.h @@ -38,7 +38,7 @@ class WEB_DIALOGS_EXPORT WebDialogDelegate { virtual ModalType GetDialogModalType() const = 0; // Returns the title of the dialog. - virtual string16 GetDialogTitle() const = 0; + virtual base::string16 GetDialogTitle() const = 0; // Returns the dialog's name identifier. Used to identify this dialog for // state restoration. |