chrome/browser/chromeos/login/web_page_view.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/chromeos/login/web_page_view.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/chromeos/login/web_page_view.cc

diff --git a/chrome/browser/chromeos/login/web_page_view.cc b/chrome/browser/chromeos/login/web_page_view.cc

index 59073ab07a2269bf731170454abd58e864ba2114..9f8e79da67577ff505033e249118b78324a21343 100644

--- a/chrome/browser/chromeos/login/web_page_view.cc

+++ b/chrome/browser/chromeos/login/web_page_view.cc

@@ -117,11 +117,11 @@ void WebPageView::Init() {

connecting_label_ = new views::Label();

connecting_label_->SetText(

- UTF16ToWide(l10n_util::GetStringUTF16(IDS_LOAD_STATE_CONNECTING)));

+ l10n_util::GetStringUTF16(IDS_LOAD_STATE_CONNECTING));

ResourceBundle& rb = ResourceBundle::GetSharedInstance();

connecting_label_->SetFont(rb.GetFont(ResourceBundle::MediumFont));

connecting_label_->SetVisible(false);

- AddChildView(connecting_label_ );

+ AddChildView(connecting_label_);

start_timer_.Start(FROM_HERE,

TimeDelta::FromMilliseconds(kStartDelayMs),