summaryrefslogtreecommitdiffstats
path: root/chrome/browser/dom_ui
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-04 06:13:02 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-04 06:13:02 +0000
commitcee9de4e4af9a1d441a1540c6c7a676c35042994 (patch)
treeac2034b3195281551dde58be9f4b2c32d8b8f8c0 /chrome/browser/dom_ui
parentd01902d70e46a90fc24d3a442805a4a665d373ca (diff)
downloadchromium_src-cee9de4e4af9a1d441a1540c6c7a676c35042994.zip
chromium_src-cee9de4e4af9a1d441a1540c6c7a676c35042994.tar.gz
chromium_src-cee9de4e4af9a1d441a1540c6c7a676c35042994.tar.bz2
Fix the build with some forgotten string conversions on non-Windows.
Review URL: http://codereview.chromium.org/40099 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10875 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
-rw-r--r--chrome/browser/dom_ui/dom_ui_contents.cc6
-rw-r--r--chrome/browser/dom_ui/dom_ui_contents.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/dom_ui/dom_ui_contents.cc b/chrome/browser/dom_ui/dom_ui_contents.cc
index 90a2bbb..eb0f60b 100644
--- a/chrome/browser/dom_ui/dom_ui_contents.cc
+++ b/chrome/browser/dom_ui/dom_ui_contents.cc
@@ -197,15 +197,15 @@ void DOMUIContents::SetInitialFocus(bool reverse) {
TabContents::SetInitialFocus(reverse);
}
-const std::wstring& DOMUIContents::GetTitle() const {
+const string16& DOMUIContents::GetTitle() const {
// Workaround for new tab page - we may be asked for a title before
// the content is ready, and we don't even want to display a 'loading...'
// message, so we force it here.
if (controller()->GetActiveEntry() &&
controller()->GetActiveEntry()->url().host() ==
NewTabUI::GetBaseURL().host()) {
- std::wstring* title = new std::wstring(
- l10n_util::GetString(IDS_NEW_TAB_TITLE));
+ string16* title = new string16(WideToUTF16Hack(
+ l10n_util::GetString(IDS_NEW_TAB_TITLE)));
return *title;
}
return WebContents::GetTitle();
diff --git a/chrome/browser/dom_ui/dom_ui_contents.h b/chrome/browser/dom_ui/dom_ui_contents.h
index d7d4d67..241f97f 100644
--- a/chrome/browser/dom_ui/dom_ui_contents.h
+++ b/chrome/browser/dom_ui/dom_ui_contents.h
@@ -110,7 +110,7 @@ class DOMUIContents : public WebContents {
// Whether we want to display the page's URL.
virtual bool ShouldDisplayURL();
// Get the title for this page.
- virtual const std::wstring& GetTitle() const;
+ virtual const string16& GetTitle() const;
// We may wish to control what happens when a URL is opened.
virtual void RequestOpenURL(const GURL& url, const GURL& referrer,
WindowOpenDisposition disposition);