chrome/browser/ui/views/fullscreen_exit_bubble_views.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/fullscreen_exit_bubble_views.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/fullscreen_exit_bubble_views.cc

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

index 27160507e03c6af41bdea283b8756e6fb1c51aa2..7bdbb526211a7aa5278c0271089caa0e31d9f1e9 100644

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

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

@@ -47,11 +47,10 @@ FullscreenExitBubbleViews::FullscreenExitView::FullscreenExitView(

link_.set_parent_owned(false);

#if !defined(OS_CHROMEOS)

link_.SetText(

- UTF16ToWide(l10n_util::GetStringFUTF16(IDS_EXIT_FULLSCREEN_MODE,

- WideToUTF16(accelerator))));

+ l10n_util::GetStringFUTF16(IDS_EXIT_FULLSCREEN_MODE,

+ WideToUTF16(accelerator)));

#else

- link_.SetText(

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

+ link_.SetText(l10n_util::GetStringUTF16(IDS_EXIT_FULLSCREEN_MODE));

#endif

link_.set_listener(bubble);

link_.SetFont(ResourceBundle::GetSharedInstance().GetFont(