From d9ae4d466b2bf5d2ed3c5d12c855a94d1ecc034c Mon Sep 17 00:00:00 2001 From: "yosin@chromium.org" <yosin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Date: Wed, 28 Sep 2011 08:49:04 +0000 Subject: Revert 103095 - Change std::wstring to string16 on WidgetDelegate::GetWindowTitle. BUG=68267 TEST=No visible changes Review URL: http://codereview.chromium.org/7972009 TBR=yosin@chromium.org Review URL: http://codereview.chromium.org/8052030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103096 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ui/views/default_search_view.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'chrome/browser/ui/views/default_search_view.h') diff --git a/chrome/browser/ui/views/default_search_view.h b/chrome/browser/ui/views/default_search_view.h index aaa96f2..f99e37a 100644 --- a/chrome/browser/ui/views/default_search_view.h +++ b/chrome/browser/ui/views/default_search_view.h @@ -57,13 +57,13 @@ class DefaultSearchView // views::DialogDelegate: // TODO(beng): Figure out why adding OVERRIDE to these methods annoys Clang. - virtual string16 GetWindowTitle() const OVERRIDE; - virtual views::View* GetInitiallyFocusedView() OVERRIDE; - virtual views::View* GetContentsView() OVERRIDE; - virtual int GetDialogButtons() const OVERRIDE; - virtual bool Accept() OVERRIDE; - virtual views::Widget* GetWidget() OVERRIDE; - virtual const views::Widget* GetWidget() const OVERRIDE; + virtual std::wstring GetWindowTitle() const; + virtual views::View* GetInitiallyFocusedView(); + virtual views::View* GetContentsView(); + virtual int GetDialogButtons() const; + virtual bool Accept(); + virtual views::Widget* GetWidget(); + virtual const views::Widget* GetWidget() const; private: // Takes ownership of |proposed_default_turl|. -- cgit v1.1