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

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

index e63e6e54a4164df2f3d859d2dd0edbcbe0cef89b..ab7f42e617201dea6e09d6bee83ca910029753b4 100644

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

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

@@ -316,12 +316,12 @@ void BackgroundView::OnLocaleChanged() {

void BackgroundView::OnOSVersionLabelTextUpdated(

const std::string& os_version_label_text) {

- os_version_label_->SetText(UTF8ToWide(os_version_label_text));

+ os_version_label_->SetText(UTF8ToUTF16(os_version_label_text));

}

void BackgroundView::OnBootTimesLabelTextUpdated(

const std::string& boot_times_label_text) {

- boot_times_label_->SetText(UTF8ToWide(boot_times_label_text));

+ boot_times_label_->SetText(UTF8ToUTF16(boot_times_label_text));

}

///////////////////////////////////////////////////////////////////////////////