summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/views/default_search_view.h
diff options
context:
space:
mode:
authoryosin@chromium.org <yosin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-28 08:49:04 +0000
committeryosin@chromium.org <yosin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-28 08:49:04 +0000
commitd9ae4d466b2bf5d2ed3c5d12c855a94d1ecc034c (patch)
treeb3215901378d4ced136abc04494204095fe7714d /chrome/browser/ui/views/default_search_view.h
parent09e14d69cad45e0a11720793ad110545592f85ae (diff)
downloadchromium_src-d9ae4d466b2bf5d2ed3c5d12c855a94d1ecc034c.zip
chromium_src-d9ae4d466b2bf5d2ed3c5d12c855a94d1ecc034c.tar.gz
chromium_src-d9ae4d466b2bf5d2ed3c5d12c855a94d1ecc034c.tar.bz2
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
Diffstat (limited to 'chrome/browser/ui/views/default_search_view.h')
-rw-r--r--chrome/browser/ui/views/default_search_view.h14
1 files changed, 7 insertions, 7 deletions
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|.