chrome/browser/ui/views/location_bar/icon_label_bubble_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/ui/views/location_bar/icon_label_bubble_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/ui/views/location_bar/icon_label_bubble_view.cc

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

index e7f426c249678bedabb1ecbbe03b56c87def1a1c..d8e3e38ff8fe75829b9ff8ee5157349d9af76c86 100644

--- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc

+++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc

@@ -4,6 +4,7 @@

#include "chrome/browser/ui/views/location_bar/icon_label_bubble_view.h"

+#include "base/utf_string_conversions.h"

#include "chrome/browser/ui/views/location_bar/location_bar_view.h"

#include "grit/theme_resources.h"

#include "ui/base/resource/resource_bundle.h"

@@ -39,7 +40,7 @@ void IconLabelBubbleView::SetFont(const gfx::Font& font) {

label_->SetFont(font);

}

-void IconLabelBubbleView::SetLabel(const std::wstring& label) {

+void IconLabelBubbleView::SetLabel(const string16& label) {

label_->SetText(label);

}