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

Unified Diff: chrome/browser/views/importer_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/importer_view.h ('k') | chrome/browser/views/options/general_page_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/importer_view.cc
diff --git a/chrome/browser/views/importer_view.cc b/chrome/browser/views/importer_view.cc
index 151badfc6600f8e46c8344a61e001bfdeeacb425..4ef686fcdf2860515060aecd9d3e92b3986602cf 100644
--- a/chrome/browser/views/importer_view.cc
+++ b/chrome/browser/views/importer_view.cc
@@ -5,6 +5,8 @@
#include "chrome/browser/views/importer_view.h"
#include "app/l10n_util.h"
+#include "base/string16.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/browser_list.h"
#include "chrome/browser/browser_window.h"
#include "chrome/browser/importer/importer_data_types.h"
@@ -183,9 +185,9 @@ int ImporterView::GetItemCount() {
return item_count;
}
-std::wstring ImporterView::GetItemAt(int index) {
+string16 ImporterView::GetItemAt(int index) {
DCHECK(importer_host_.get());
- return importer_host_->GetSourceProfileNameAt(index);
+ return WideToUTF16Hack(importer_host_->GetSourceProfileNameAt(index));
}
void ImporterView::ItemChanged(views::Combobox* combobox,
« no previous file with comments | « chrome/browser/views/importer_view.h ('k') | chrome/browser/views/options/general_page_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698