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

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.h

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

index b8cd71c0f8bdaaf16b66c99eb395ee992f41d620..38458f5da27de599d3086a44e771a2be2e8557de 100644

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

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

@@ -8,6 +8,7 @@

#include <string>

+#include "base/string16.h"

#include "ui/gfx/size.h"

#include "views/painter.h"

#include "views/view.h"

@@ -34,7 +35,7 @@ class IconLabelBubbleView : public views::View {

virtual ~IconLabelBubbleView();

void SetFont(const gfx::Font& font);

- void SetLabel(const std::wstring& label);

+ void SetLabel(const string16& label);

void SetImage(const SkBitmap& bitmap);

void set_is_extension_icon(bool is_extension_icon) {

is_extension_icon_ = is_extension_icon;