summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/webui
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-01 19:36:25 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-01 19:36:25 +0000
commit5204fb2df220e34032e39042aaf6e65cccdaedd0 (patch)
tree61886bf553ad527c07c1b5b269b1da9e06258536 /chrome/browser/ui/webui
parent2c797994373f4cf5e6b4c27b502202d5aeb946a3 (diff)
downloadchromium_src-5204fb2df220e34032e39042aaf6e65cccdaedd0.zip
chromium_src-5204fb2df220e34032e39042aaf6e65cccdaedd0.tar.gz
chromium_src-5204fb2df220e34032e39042aaf6e65cccdaedd0.tar.bz2
importer: Convert GetSourceProfileNameAt to string16.
BUG=23581 TEST=None R=avi@chromium.org Review URL: http://codereview.chromium.org/6788003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80201 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui')
-rw-r--r--chrome/browser/ui/webui/options/import_data_handler.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/ui/webui/options/import_data_handler.cc b/chrome/browser/ui/webui/options/import_data_handler.cc
index df05329..b37f3c2 100644
--- a/chrome/browser/ui/webui/options/import_data_handler.cc
+++ b/chrome/browser/ui/webui/options/import_data_handler.cc
@@ -124,11 +124,10 @@ void ImportDataHandler::SourceProfilesLoaded() {
for (int i = 0; i < profiles_count; i++) {
const importer::ProfileInfo& source_profile =
importer_list_->GetSourceProfileInfoAt(i);
- string16 browser_name = WideToUTF16Hack(source_profile.description);
uint16 browser_services = source_profile.services_supported;
DictionaryValue* browser_profile = new DictionaryValue();
- browser_profile->SetString("name", browser_name);
+ browser_profile->SetString("name", source_profile.description);
browser_profile->SetInteger("index", i);
browser_profile->SetBoolean("history",
(browser_services & importer::HISTORY) != 0);