Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(927)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/views/collected_cookies_win.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc ('k') | chrome/browser/ui/views/content_setting_bubble_contents.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/collected_cookies_win.cc
===================================================================
--- chrome/browser/ui/views/collected_cookies_win.cc (revision 104083)
+++ chrome/browser/ui/views/collected_cookies_win.cc (working copy)
@@ -240,8 +240,8 @@
TabSpecificContentSettings* content_settings = wrapper_->content_settings();
// Create the controls that go into the pane.
- allowed_label_ = new views::Label(l10n_util::GetStringUTF16(
- IDS_COLLECTED_COOKIES_ALLOWED_COOKIES_LABEL));
+ allowed_label_ = new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(
+ IDS_COLLECTED_COOKIES_ALLOWED_COOKIES_LABEL)));
allowed_cookies_tree_model_.reset(
content_settings->GetAllowedCookiesTreeModel());
allowed_cookies_tree_ = new views::TreeView();
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc ('k') | chrome/browser/ui/views/content_setting_bubble_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698