diff options
| author | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
| commit | 3345a6884c488ff3a535c2c9acdd33d74b37e311 (patch) | |
| tree | 7784b988ef1698cb6967ea1bdf07616237716c6c /chrome/browser/profile_import_process_host.cc | |
| parent | efc8475837ec58186051f23bb03542620424f6ce (diff) | |
| download | external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.zip external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.gz external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.bz2 | |
Merge Chromium at 7.0.540.0 : Initial merge by git
Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.
Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
Diffstat (limited to 'chrome/browser/profile_import_process_host.cc')
| -rw-r--r-- | chrome/browser/profile_import_process_host.cc | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/chrome/browser/profile_import_process_host.cc b/chrome/browser/profile_import_process_host.cc index 84a2684..a5b84ee 100644 --- a/chrome/browser/profile_import_process_host.cc +++ b/chrome/browser/profile_import_process_host.cc @@ -7,7 +7,7 @@ #include "app/l10n_util.h" #include "base/command_line.h" #include "base/message_loop.h" -#include "base/string_util.h" +#include "base/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/importer/firefox_importer_utils.h" #include "chrome/browser/importer/importer_messages.h" @@ -35,20 +35,20 @@ bool ProfileImportProcessHost::StartProfileImportProcess( // in the external process. DictionaryValue localized_strings; localized_strings.SetString( - IntToWString(IDS_BOOKMARK_GROUP_FROM_FIREFOX), - l10n_util::GetString(IDS_BOOKMARK_GROUP_FROM_FIREFOX)); + base::IntToString(IDS_BOOKMARK_GROUP_FROM_FIREFOX), + l10n_util::GetStringUTF8(IDS_BOOKMARK_GROUP_FROM_FIREFOX)); localized_strings.SetString( - IntToWString(IDS_BOOKMARK_GROUP_FROM_SAFARI), - l10n_util::GetString(IDS_BOOKMARK_GROUP_FROM_SAFARI)); + base::IntToString(IDS_BOOKMARK_GROUP_FROM_SAFARI), + l10n_util::GetStringUTF8(IDS_BOOKMARK_GROUP_FROM_SAFARI)); localized_strings.SetString( - IntToWString(IDS_IMPORT_FROM_FIREFOX), - l10n_util::GetString(IDS_IMPORT_FROM_FIREFOX)); + base::IntToString(IDS_IMPORT_FROM_FIREFOX), + l10n_util::GetStringUTF8(IDS_IMPORT_FROM_FIREFOX)); localized_strings.SetString( - IntToWString(IDS_IMPORT_FROM_GOOGLE_TOOLBAR), - l10n_util::GetString(IDS_IMPORT_FROM_GOOGLE_TOOLBAR)); + base::IntToString(IDS_IMPORT_FROM_GOOGLE_TOOLBAR), + l10n_util::GetStringUTF8(IDS_IMPORT_FROM_GOOGLE_TOOLBAR)); localized_strings.SetString( - IntToWString(IDS_IMPORT_FROM_SAFARI), - l10n_util::GetString(IDS_IMPORT_FROM_SAFARI)); + base::IntToString(IDS_IMPORT_FROM_SAFARI), + l10n_util::GetStringUTF8(IDS_IMPORT_FROM_SAFARI)); Send(new ProfileImportProcessMsg_StartImport( profile_info, items, localized_strings, import_to_bookmark_bar)); @@ -85,10 +85,9 @@ bool ProfileImportProcessHost::StartProcess() { } CommandLine* cmd_line = new CommandLine(exe_path); - cmd_line->AppendSwitchWithValue(switches::kProcessType, - switches::kProfileImportProcess); - cmd_line->AppendSwitchWithValue(switches::kProcessChannelID, - ASCIIToWide(channel_id())); + cmd_line->AppendSwitchASCII(switches::kProcessType, + switches::kProfileImportProcess); + cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id()); SetCrashReporterCommandLine(cmd_line); |