chrome/browser/ui/views/first_run_bubble.cc - Issue 8113031: Change std::wstring to string16 for views::Label and views::Link

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 8113031: Change std::wstring to string16 for views::Label and views::Link (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase 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:

Index: chrome/browser/ui/views/first_run_bubble.cc

diff --git a/chrome/browser/ui/views/first_run_bubble.cc b/chrome/browser/ui/views/first_run_bubble.cc

index 14428d5679f302a6bfbcdf1972093a4a249508b5..b391010b6ce66f6cf98bfec8ed2eee9993ad5e2d 100644

--- a/chrome/browser/ui/views/first_run_bubble.cc

+++ b/chrome/browser/ui/views/first_run_bubble.cc

@@ -421,9 +421,9 @@ FirstRunMinimalBubbleView::FirstRunMinimalBubbleView(

const gfx::Font& font =

ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::MediumFont);

- label1_ = new views::Label(UTF16ToWide(l10n_util::GetStringFUTF16(

+ label1_ = new views::Label(l10n_util::GetStringFUTF16(

IDS_FR_SE_BUBBLE_TITLE,

- GetDefaultSearchEngineName(profile_))));

+ GetDefaultSearchEngineName(profile_)));

label1_->SetFont(font.DeriveFont(3, gfx::Font::BOLD));

label1_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);

AddChildView(label1_);