summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/views/about_chrome_view.cc
diff options
context:
space:
mode:
authoryosin@chromium.org <yosin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-28 08:12:42 +0000
committeryosin@chromium.org <yosin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-28 08:12:42 +0000
commit09e14d69cad45e0a11720793ad110545592f85ae (patch)
tree22c11a51cef32b725d1c6b3097d90e9c50413e8b /chrome/browser/ui/views/about_chrome_view.cc
parent1cf92d0f4fdd32481a23b3813ccaab2bd8221f39 (diff)
downloadchromium_src-09e14d69cad45e0a11720793ad110545592f85ae.zip
chromium_src-09e14d69cad45e0a11720793ad110545592f85ae.tar.gz
chromium_src-09e14d69cad45e0a11720793ad110545592f85ae.tar.bz2
Change std::wstring to string16 on WidgetDelegate::GetWindowTitle.
BUG=68267 TEST=No visible changes Review URL: http://codereview.chromium.org/7972009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103095 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/about_chrome_view.cc')
-rw-r--r--chrome/browser/ui/views/about_chrome_view.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/views/about_chrome_view.cc b/chrome/browser/ui/views/about_chrome_view.cc
index 2bf41d6..a36802a 100644
--- a/chrome/browser/ui/views/about_chrome_view.cc
+++ b/chrome/browser/ui/views/about_chrome_view.cc
@@ -517,8 +517,8 @@ std::wstring AboutChromeView::GetDialogButtonLabel(
return L"";
}
-std::wstring AboutChromeView::GetWindowTitle() const {
- return UTF16ToWide(l10n_util::GetStringUTF16(IDS_ABOUT_CHROME_TITLE));
+string16 AboutChromeView::GetWindowTitle() const {
+ return l10n_util::GetStringUTF16(IDS_ABOUT_CHROME_TITLE);
}
bool AboutChromeView::IsDialogButtonEnabled(
@@ -591,7 +591,7 @@ void AboutChromeView::LinkClicked(views::Link* source, int event_flags) {
void AboutChromeView::OnReportResults(GoogleUpdateUpgradeResult result,
GoogleUpdateErrorCode error_code,
- const std::wstring& version) {
+ const string16& version) {
// Drop the last reference to the object so that it gets cleaned up here.
google_updater_ = NULL;