From ca9e62ec12f780451289c594df0a79e71684232a Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Mon, 27 May 2013 06:07:20 +0000 Subject: 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 --- ui/web_dialogs/test/test_web_dialog_delegate.cc | 2 +- ui/web_dialogs/test/test_web_dialog_delegate.h | 2 +- ui/web_dialogs/web_dialog_delegate.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ui/web_dialogs') 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* 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. -- cgit v1.1