Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(117)

Unified Diff: chrome/browser/views/tabs/tab_2.cc

Issue 155334: Convert some stuff to string16 so the toolkit_views build can build again (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/views/frame/browser_view.cc ('k') | chrome/browser/views/tabs/tab_renderer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/tabs/tab_2.cc
===================================================================
--- chrome/browser/views/tabs/tab_2.cc (revision 20304)
+++ chrome/browser/views/tabs/tab_2.cc (working copy)
@@ -460,9 +460,9 @@
string16 title = model_->GetTitle(this);
if (title.empty()) {
if (model_->IsLoading(this))
- title = l10n_util::GetString(IDS_TAB_LOADING_TITLE);
+ title = l10n_util::GetStringUTF16(IDS_TAB_LOADING_TITLE);
else
- title = l10n_util::GetString(IDS_TAB_UNTITLED_TITLE);
+ title = l10n_util::GetStringUTF16(IDS_TAB_UNTITLED_TITLE);
} else {
Browser::FormatTitleForDisplay(&title);
}
@@ -472,9 +472,9 @@
BrowserThemeProvider::COLOR_TAB_TEXT :
BrowserThemeProvider::COLOR_BACKGROUND_TAB_TEXT);
- canvas->DrawStringInt(title, *title_font, title_color, title_bounds_.x(),
- title_bounds_.y(), title_bounds_.width(),
- title_bounds_.height());
+ canvas->DrawStringInt(UTF16ToWideHack(title), *title_font, title_color,
+ title_bounds_.x(), title_bounds_.y(),
+ title_bounds_.width(), title_bounds_.height());
}
void Tab2::PaintTabBackground(gfx::Canvas* canvas) {
« no previous file with comments | « chrome/browser/views/frame/browser_view.cc ('k') | chrome/browser/views/tabs/tab_renderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698