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

Unified Diff: chrome/browser/ui/views/first_run_search_engine_view.cc

Issue 8142026: Revert 104076 - Change std::wstring to string16 for views::Link (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 2 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
Index: chrome/browser/ui/views/first_run_search_engine_view.cc
===================================================================
--- chrome/browser/ui/views/first_run_search_engine_view.cc (revision 104083)
+++ chrome/browser/ui/views/first_run_search_engine_view.cc (working copy)
@@ -325,8 +325,8 @@
int label_width = GetPreferredSize().width() - 2 * views::kPanelHorizMargin;
// Add title and text asking the user to choose a search engine:
- title_label_ = new Label(l10n_util::GetStringUTF16(
- IDS_FR_SEARCH_MAIN_LABEL));
+ title_label_ = new Label(UTF16ToWide(l10n_util::GetStringUTF16(
+ IDS_FR_SEARCH_MAIN_LABEL)));
title_label_->SetColor(SK_ColorBLACK);
title_label_->SetFont(title_label_->font().DeriveFont(3, gfx::Font::BOLD));
title_label_->SetMultiLine(true);
@@ -334,9 +334,9 @@
title_label_->SizeToFit(label_width);
AddChildView(title_label_);
- text_label_ = new Label(l10n_util::GetStringFUTF16(
+ text_label_ = new Label(UTF16ToWide(l10n_util::GetStringFUTF16(
IDS_FR_SEARCH_TEXT,
- l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
+ l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))));
text_label_->SetColor(SK_ColorBLACK);
text_label_->SetFont(text_label_->font().DeriveFont(1, gfx::Font::NORMAL));
text_label_->SetMultiLine(true);
« no previous file with comments | « chrome/browser/ui/views/first_run_bubble.cc ('k') | chrome/browser/ui/views/fullscreen_exit_bubble_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698