| 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 "base/file_path.h" | 7 #include "base/file_path.h" |
| 8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
| 9 #include "chrome/browser/first_run/first_run_internal.h" | 9 #include "chrome/browser/first_run/first_run_internal.h" |
| 10 #include "chrome/browser/importer/importer_host.h" | 10 #include "chrome/browser/importer/importer_host.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 } // namespace internal | 23 } // namespace internal |
| 24 } // namespace first_run | 24 } // namespace first_run |
| 25 | 25 |
| 26 namespace first_run { | 26 namespace first_run { |
| 27 | 27 |
| 28 void AutoImport( | 28 void AutoImport( |
| 29 Profile* profile, | 29 Profile* profile, |
| 30 bool homepage_defined, | 30 bool homepage_defined, |
| 31 int import_items, | 31 int import_items, |
| 32 int dont_import_items, | 32 int dont_import_items, |
| 33 bool search_engine_experiment, | |
| 34 bool randomize_search_engine_experiment, | |
| 35 bool make_chrome_default, | 33 bool make_chrome_default, |
| 36 ProcessSingleton* process_singleton) { | 34 ProcessSingleton* process_singleton) { |
| 37 // We need to avoid dispatching new tabs when we are importing because | 35 // We need to avoid dispatching new tabs when we are importing because |
| 38 // that will lead to data corruption or a crash. Because there is no UI for | 36 // that will lead to data corruption or a crash. Because there is no UI for |
| 39 // the import process, we pass NULL as the window to bring to the foreground | 37 // the import process, we pass NULL as the window to bring to the foreground |
| 40 // when a CopyData message comes in; this causes the message to be silently | 38 // when a CopyData message comes in; this causes the message to be silently |
| 41 // discarded, which is the correct behavior during the import process. | 39 // discarded, which is the correct behavior during the import process. |
| 42 process_singleton->Lock(NULL); | 40 process_singleton->Lock(NULL); |
| 43 | 41 |
| 44 scoped_refptr<ImporterHost> importer_host; | 42 scoped_refptr<ImporterHost> importer_host; |
| 45 // TODO(csilv,mirandac): Out-of-process import has only been qualified on | 43 // TODO(csilv,mirandac): Out-of-process import has only been qualified on |
| 46 // MacOS X, so we will only use it on that platform since it is required. | 44 // MacOS X, so we will only use it on that platform since it is required. |
| 47 // Remove this conditional logic once oop import is qualified for | 45 // Remove this conditional logic once oop import is qualified for |
| 48 // Linux/Windows. http://crbug.com/22142 | 46 // Linux/Windows. http://crbug.com/22142 |
| 49 importer_host = new ExternalProcessImporterHost; | 47 importer_host = new ExternalProcessImporterHost; |
| 50 | 48 |
| 51 internal::AutoImportPlatformCommon(importer_host, | 49 internal::AutoImportPlatformCommon(importer_host, |
| 52 profile, | 50 profile, |
| 53 homepage_defined, | 51 homepage_defined, |
| 54 import_items, | 52 import_items, |
| 55 dont_import_items, | 53 dont_import_items, |
| 56 search_engine_experiment, | |
| 57 randomize_search_engine_experiment, | |
| 58 make_chrome_default); | 54 make_chrome_default); |
| 59 | 55 |
| 60 process_singleton->Unlock(); | 56 process_singleton->Unlock(); |
| 61 first_run::CreateSentinel(); | 57 first_run::CreateSentinel(); |
| 62 } | 58 } |
| 63 | 59 |
| 64 FilePath MasterPrefsPath() { | 60 FilePath MasterPrefsPath() { |
| 65 return master_prefs::MasterPrefsPath(); | 61 return master_prefs::MasterPrefsPath(); |
| 66 } | 62 } |
| 67 | 63 |
| 68 } //namespace first_run | 64 } //namespace first_run |
| OLD | NEW |