chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc - Issue 8142026: Revert 104076 - Change std::wstring to string16 for 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/bookmarks/bookmark_bar_instructions_view.cc

Issue 8142026: Revert 104076 - Change std::wstring to string16 for views::Link (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: 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/bookmarks/bookmark_bar_instructions_view.cc

===================================================================

--- chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc (revision 104083)

+++ chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc (working copy)

@@ -4,8 +4,6 @@

#include "chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h"

-#include <algorithm>

#include "base/utf_string_conversions.h"

#include "chrome/browser/defaults.h"

#include "chrome/browser/themes/theme_service.h"

@@ -28,12 +26,12 @@

baseline_(-1),

updated_colors_(false) {

instructions_ = new views::Label(

- l10n_util::GetStringUTF16(IDS_BOOKMARKS_NO_ITEMS));

+ UTF16ToWide(l10n_util::GetStringUTF16(IDS_BOOKMARKS_NO_ITEMS)));

AddChildView(instructions_);

if (browser_defaults::kShowImportOnBookmarkBar) {

import_link_ = new views::Link(

- l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_IMPORT_LINK));

+ UTF16ToWide(l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_IMPORT_LINK)));

// We don't want the link to alter tab navigation.

import_link_->set_focusable(false);

import_link_->set_listener(this);