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

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

index 68006496b5147be1ef079b3ad2aad45ee024f8f1..803b9985561d9ad36ab9857c72a22e2bac740799 100644

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

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

@@ -240,8 +240,8 @@ views::View* CollectedCookiesWin::CreateAllowedPane() {

TabSpecificContentSettings* content_settings = wrapper_->content_settings();

// Create the controls that go into the pane.

- allowed_label_ = new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(

- IDS_COLLECTED_COOKIES_ALLOWED_COOKIES_LABEL)));

+ allowed_label_ = new views::Label(l10n_util::GetStringUTF16(

+ IDS_COLLECTED_COOKIES_ALLOWED_COOKIES_LABEL));

allowed_cookies_tree_model_.reset(

content_settings->GetAllowedCookiesTreeModel());

allowed_cookies_tree_ = new views::TreeView();