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 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
205 scoped_refptr<ImporterHost> importer_host(new ImporterHost); | 205 scoped_refptr<ImporterHost> importer_host(new ImporterHost); |
206 importer_host->set_headless(); | 206 importer_host->set_headless(); |
207 | 207 |
208 importer::SourceProfile source_profile; | 208 importer::SourceProfile source_profile; |
209 source_profile.importer_type = importer::TYPE_BOOKMARKS_FILE; | 209 source_profile.importer_type = importer::TYPE_BOOKMARKS_FILE; |
210 source_profile.source_path = file_path; | 210 source_profile.source_path = file_path; |
211 | 211 |
212 first_run::internal::ImportEndedObserver observer; | 212 first_run::internal::ImportEndedObserver observer; |
213 importer_host->SetObserver(&observer); | 213 importer_host->SetObserver(&observer); |
214 importer_host->StartImportSettings( | 214 importer_host->StartImportSettings( |
215 source_profile, profile, importer::FAVORITES, new ProfileWriter(profile), | 215 source_profile, profile, importer::FAVORITES, new ProfileWriter(profile)); |
216 true); | |
217 // If the import process has not errored out, block on it. | 216 // If the import process has not errored out, block on it. |
218 if (!observer.ended()) { | 217 if (!observer.ended()) { |
219 observer.set_should_quit_message_loop(); | 218 observer.set_should_quit_message_loop(); |
220 MessageLoop::current()->Run(); | 219 MessageLoop::current()->Run(); |
221 } | 220 } |
222 } | 221 } |
223 | 222 |
224 GURL UrlFromString(const std::string& in) { | 223 GURL UrlFromString(const std::string& in) { |
225 return GURL(in); | 224 return GURL(in); |
226 } | 225 } |
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
764 internal::DoPostImportPlatformSpecificTasks(); | 763 internal::DoPostImportPlatformSpecificTasks(); |
765 } | 764 } |
766 | 765 |
767 bool DidPerformProfileImport(bool* exited_successfully) { | 766 bool DidPerformProfileImport(bool* exited_successfully) { |
768 if (exited_successfully) | 767 if (exited_successfully) |
769 *exited_successfully = profile_import_exited_successfully; | 768 *exited_successfully = profile_import_exited_successfully; |
770 return did_perform_profile_import; | 769 return did_perform_profile_import; |
771 } | 770 } |
772 | 771 |
773 } // namespace first_run | 772 } // namespace first_run |
OLD | NEW |