| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/importer/importer_bridge.h" | 5 #include "chrome/browser/importer/importer_bridge.h" |
| 6 | 6 |
| 7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
| 8 #include "base/scoped_ptr.h" | 8 #include "base/scoped_ptr.h" |
| 9 #include "base/utf_string_conversions.h" |
| 9 #include "base/values.h" | 10 #include "base/values.h" |
| 10 #include "chrome/browser/chrome_thread.h" | 11 #include "chrome/browser/chrome_thread.h" |
| 11 #include "chrome/browser/history/history_types.h" | 12 #include "chrome/browser/history/history_types.h" |
| 12 #include "chrome/browser/importer/importer.h" | 13 #include "chrome/browser/importer/importer.h" |
| 13 #if defined(OS_WIN) | 14 #if defined(OS_WIN) |
| 14 #include "chrome/browser/password_manager/ie7_password.h" | 15 #include "chrome/browser/password_manager/ie7_password.h" |
| 15 #endif | 16 #endif |
| 16 #include "chrome/common/child_thread.h" | 17 #include "chrome/common/child_thread.h" |
| 17 #include "chrome/browser/importer/importer_messages.h" | 18 #include "chrome/browser/importer/importer_messages.h" |
| 18 #include "chrome/profile_import/profile_import_thread.h" | 19 #include "chrome/profile_import/profile_import_thread.h" |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 } | 183 } |
| 183 | 184 |
| 184 std::wstring ExternalProcessImporterBridge::GetLocalizedString( | 185 std::wstring ExternalProcessImporterBridge::GetLocalizedString( |
| 185 int message_id) { | 186 int message_id) { |
| 186 std::wstring message; | 187 std::wstring message; |
| 187 localized_strings_->GetString(ASCIIToWide(base::IntToString(message_id)), | 188 localized_strings_->GetString(ASCIIToWide(base::IntToString(message_id)), |
| 188 &message); | 189 &message); |
| 189 return message; | 190 return message; |
| 190 } | 191 } |
| 191 | 192 |
| OLD | NEW |