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

Unified Diff: chrome/browser/views/cookie_info_view.cc

Issue 3159031: Remove wstrings from bookmarks, part 12. (Closed)
Patch Set: rebased ToT Created 10 years, 4 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/views/cookie_info_view.h ('k') | chrome/browser/views/importer_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/cookie_info_view.cc
diff --git a/chrome/browser/views/cookie_info_view.cc b/chrome/browser/views/cookie_info_view.cc
index 4727bd10fa746c47eb408d9dcf4dc6dfa3df0cd3..f2a1bb10752dd8ffeb9d61b8fb683fe02f433ef2 100644
--- a/chrome/browser/views/cookie_info_view.cc
+++ b/chrome/browser/views/cookie_info_view.cc
@@ -9,7 +9,9 @@
#include "app/l10n_util.h"
#include "base/i18n/time_formatting.h"
#include "base/message_loop.h"
+#include "base/string16.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/cookies_tree_model.h"
#include "chrome/browser/profile.h"
#include "gfx/canvas.h"
@@ -149,8 +151,8 @@ int CookieInfoView::GetItemCount() {
return static_cast<int>(expire_combo_values_.size());
}
-std::wstring CookieInfoView::GetItemAt(int index) {
- return expire_combo_values_[index];
+string16 CookieInfoView::GetItemAt(int index) {
+ return WideToUTF16Hack(expire_combo_values_[index]);
}
void CookieInfoView::AddLabelRow(int layout_id, views::GridLayout* layout,
« no previous file with comments | « chrome/browser/views/cookie_info_view.h ('k') | chrome/browser/views/importer_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698