| 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/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
| 9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 } // namespace internal | 61 } // namespace internal |
| 62 } // namespace first_run | 62 } // namespace first_run |
| 63 | 63 |
| 64 namespace first_run { | 64 namespace first_run { |
| 65 | 65 |
| 66 void AutoImport( | 66 void AutoImport( |
| 67 Profile* profile, | 67 Profile* profile, |
| 68 bool homepage_defined, | 68 bool homepage_defined, |
| 69 int import_items, | 69 int import_items, |
| 70 int dont_import_items, | 70 int dont_import_items, |
| 71 bool search_engine_experiment, | |
| 72 bool randomize_search_engine_experiment, | |
| 73 bool make_chrome_default, | 71 bool make_chrome_default, |
| 74 ProcessSingleton* process_singleton) { | 72 ProcessSingleton* process_singleton) { |
| 75 #if !defined(USE_AURA) | 73 #if !defined(USE_AURA) |
| 76 // We need to avoid dispatching new tabs when we are importing because | 74 // We need to avoid dispatching new tabs when we are importing because |
| 77 // that will lead to data corruption or a crash. Because there is no UI for | 75 // that will lead to data corruption or a crash. Because there is no UI for |
| 78 // the import process, we pass NULL as the window to bring to the foreground | 76 // the import process, we pass NULL as the window to bring to the foreground |
| 79 // when a CopyData message comes in; this causes the message to be silently | 77 // when a CopyData message comes in; this causes the message to be silently |
| 80 // discarded, which is the correct behavior during the import process. | 78 // discarded, which is the correct behavior during the import process. |
| 81 process_singleton->Lock(NULL); | 79 process_singleton->Lock(NULL); |
| 82 | 80 |
| 83 scoped_refptr<ImporterHost> importer_host; | 81 scoped_refptr<ImporterHost> importer_host; |
| 84 importer_host = new ImporterHost; | 82 importer_host = new ImporterHost; |
| 85 | 83 |
| 86 internal::AutoImportPlatformCommon(importer_host, | 84 internal::AutoImportPlatformCommon(importer_host, |
| 87 profile, | 85 profile, |
| 88 homepage_defined, | 86 homepage_defined, |
| 89 import_items, | 87 import_items, |
| 90 dont_import_items, | 88 dont_import_items, |
| 91 search_engine_experiment, | |
| 92 randomize_search_engine_experiment, | |
| 93 make_chrome_default); | 89 make_chrome_default); |
| 94 | 90 |
| 95 process_singleton->Unlock(); | 91 process_singleton->Unlock(); |
| 96 CreateSentinel(); | 92 CreateSentinel(); |
| 97 #endif // !defined(USE_AURA) | 93 #endif // !defined(USE_AURA) |
| 98 } | 94 } |
| 99 | 95 |
| 100 FilePath MasterPrefsPath() { | 96 FilePath MasterPrefsPath() { |
| 101 // The standard location of the master prefs is next to the chrome binary. | 97 // The standard location of the master prefs is next to the chrome binary. |
| 102 FilePath master_prefs; | 98 FilePath master_prefs; |
| 103 if (!PathService::Get(base::DIR_EXE, &master_prefs)) | 99 if (!PathService::Get(base::DIR_EXE, &master_prefs)) |
| 104 return FilePath(); | 100 return FilePath(); |
| 105 return master_prefs.AppendASCII(installer::kDefaultMasterPrefs); | 101 return master_prefs.AppendASCII(installer::kDefaultMasterPrefs); |
| 106 } | 102 } |
| 107 | 103 |
| 108 } // namespace first_run | 104 } // namespace first_run |
| OLD | NEW |