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

Side by Side Diff: chrome/browser/importer/in_process_importer_bridge.cc

Issue 200713005: components: Rename encryptor directory to os_crypt. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/in_process_importer_bridge.h" 5 #include "chrome/browser/importer/in_process_importer_bridge.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/importer/external_process_importer_host.h" 10 #include "chrome/browser/importer/external_process_importer_host.h"
11 #include "chrome/browser/search_engines/template_url.h" 11 #include "chrome/browser/search_engines/template_url.h"
12 #include "chrome/browser/search_engines/template_url_parser.h" 12 #include "chrome/browser/search_engines/template_url_parser.h"
13 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 13 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
14 #include "chrome/browser/search_engines/template_url_service.h" 14 #include "chrome/browser/search_engines/template_url_service.h"
15 #include "chrome/common/importer/imported_bookmark_entry.h" 15 #include "chrome/common/importer/imported_bookmark_entry.h"
16 #include "chrome/common/importer/imported_favicon_usage.h" 16 #include "chrome/common/importer/imported_favicon_usage.h"
17 #include "components/autofill/core/common/password_form.h" 17 #include "components/autofill/core/common/password_form.h"
18 #include "content/public/browser/browser_thread.h" 18 #include "content/public/browser/browser_thread.h"
19 #include "ui/base/l10n/l10n_util.h" 19 #include "ui/base/l10n/l10n_util.h"
20 20
21 #if defined(OS_WIN) 21 #if defined(OS_WIN)
22 #include "components/encryptor/ie7_password_win.h" 22 #include "components/os_crypt/ie7_password_win.h"
23 #endif 23 #endif
24 24
25 #include <iterator> 25 #include <iterator>
26 26
27 namespace { 27 namespace {
28 28
29 history::URLRows ConvertImporterURLRowsToHistoryURLRows( 29 history::URLRows ConvertImporterURLRowsToHistoryURLRows(
30 const std::vector<ImporterURLRow>& rows) { 30 const std::vector<ImporterURLRow>& rows) {
31 history::URLRows converted; 31 history::URLRows converted;
32 converted.reserve(rows.size()); 32 converted.reserve(rows.size());
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 BrowserThread::PostTask( 276 BrowserThread::PostTask(
277 BrowserThread::UI, FROM_HERE, 277 BrowserThread::UI, FROM_HERE,
278 base::Bind(&ExternalProcessImporterHost::NotifyImportEnded, host_)); 278 base::Bind(&ExternalProcessImporterHost::NotifyImportEnded, host_));
279 } 279 }
280 280
281 base::string16 InProcessImporterBridge::GetLocalizedString(int message_id) { 281 base::string16 InProcessImporterBridge::GetLocalizedString(int message_id) {
282 return l10n_util::GetStringUTF16(message_id); 282 return l10n_util::GetStringUTF16(message_id);
283 } 283 }
284 284
285 InProcessImporterBridge::~InProcessImporterBridge() {} 285 InProcessImporterBridge::~InProcessImporterBridge() {}
OLDNEW
« no previous file with comments | « chrome/browser/importer/ie_importer_browsertest_win.cc ('k') | chrome/browser/net/cookie_store_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698