OLD | NEW |
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/first_run/first_run.h" | 5 #include "chrome/browser/first_run/first_run.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> |
8 | 9 |
9 #include "base/command_line.h" | 10 #include "base/command_line.h" |
10 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
11 #include "base/files/file_path.h" | 12 #include "base/files/file_path.h" |
12 #include "base/files/file_util.h" | 13 #include "base/files/file_util.h" |
13 #include "base/lazy_instance.h" | 14 #include "base/lazy_instance.h" |
14 #include "base/macros.h" | 15 #include "base/macros.h" |
15 #include "base/memory/ref_counted.h" | 16 #include "base/memory/ref_counted.h" |
16 #include "base/metrics/histogram.h" | 17 #include "base/metrics/histogram.h" |
17 #include "base/path_service.h" | 18 #include "base/path_service.h" |
(...skipping 772 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
790 // Deletes itself. | 791 // Deletes itself. |
791 ExternalProcessImporterHost* importer_host = | 792 ExternalProcessImporterHost* importer_host = |
792 new ExternalProcessImporterHost; | 793 new ExternalProcessImporterHost; |
793 | 794 |
794 // Don't show the warning dialog if import fails. | 795 // Don't show the warning dialog if import fails. |
795 importer_host->set_headless(); | 796 importer_host->set_headless(); |
796 | 797 |
797 importer::LogImporterUseToMetrics( | 798 importer::LogImporterUseToMetrics( |
798 "AutoImport", importer_list->GetSourceProfileAt(0).importer_type); | 799 "AutoImport", importer_list->GetSourceProfileAt(0).importer_type); |
799 | 800 |
800 ImportSettings(profile, importer_host, importer_list.Pass(), items); | 801 ImportSettings(profile, importer_host, std::move(importer_list), items); |
801 } | 802 } |
802 | 803 |
803 if (!import_bookmarks_path.empty()) { | 804 if (!import_bookmarks_path.empty()) { |
804 // Deletes itself. | 805 // Deletes itself. |
805 ExternalProcessImporterHost* file_importer_host = | 806 ExternalProcessImporterHost* file_importer_host = |
806 new ExternalProcessImporterHost; | 807 new ExternalProcessImporterHost; |
807 file_importer_host->set_headless(); | 808 file_importer_host->set_headless(); |
808 | 809 |
809 ImportFromFile(profile, file_importer_host, import_bookmarks_path); | 810 ImportFromFile(profile, file_importer_host, import_bookmarks_path); |
810 } | 811 } |
(...skipping 17 matching lines...) Expand all Loading... |
828 SetShouldDoPersonalDataManagerFirstRun(); | 829 SetShouldDoPersonalDataManagerFirstRun(); |
829 | 830 |
830 internal::DoPostImportPlatformSpecificTasks(profile); | 831 internal::DoPostImportPlatformSpecificTasks(profile); |
831 } | 832 } |
832 | 833 |
833 uint16_t auto_import_state() { | 834 uint16_t auto_import_state() { |
834 return g_auto_import_state; | 835 return g_auto_import_state; |
835 } | 836 } |
836 | 837 |
837 } // namespace first_run | 838 } // namespace first_run |
OLD | NEW |