summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/views/frame/browser_view.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui/views/frame/browser_view.cc')
-rw-r--r--chrome/browser/ui/views/frame/browser_view.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 9b35e6c..374305a 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -8,6 +8,8 @@
#include <gtk/gtk.h>
#endif
+#include <algorithm>
+
#include "base/auto_reset.h"
#include "base/command_line.h"
#include "base/i18n/rtl.h"
@@ -1525,15 +1527,15 @@ bool BrowserView::IsModal() const {
return false;
}
-std::wstring BrowserView::GetWindowTitle() const {
- return UTF16ToWideHack(browser_->GetWindowTitleForCurrentTab());
+string16 BrowserView::GetWindowTitle() const {
+ return browser_->GetWindowTitleForCurrentTab();
}
-std::wstring BrowserView::GetAccessibleWindowTitle() const {
+string16 BrowserView::GetAccessibleWindowTitle() const {
if (IsOffTheRecord()) {
- return UTF16ToWide(l10n_util::GetStringFUTF16(
+ return l10n_util::GetStringFUTF16(
IDS_ACCESSIBLE_INCOGNITO_WINDOW_TITLE_FORMAT,
- WideToUTF16(GetWindowTitle())));
+ GetWindowTitle());
}
return GetWindowTitle();
}