OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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.h" | 5 #include "chrome/browser/first_run.h" |
6 | 6 |
7 #import "base/scoped_nsobject.h" | 7 #import "base/scoped_nsobject.h" |
8 #include "base/sys_string_conversions.h" | 8 #include "base/sys_string_conversions.h" |
9 #import "chrome/app/breakpad_mac.h" | 9 #import "chrome/app/breakpad_mac.h" |
10 #import "chrome/browser/cocoa/first_run_dialog.h" | 10 #import "chrome/browser/cocoa/first_run_dialog.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 | 44 |
45 DISALLOW_COPY_AND_ASSIGN(FirstRunController); | 45 DISALLOW_COPY_AND_ASSIGN(FirstRunController); |
46 }; | 46 }; |
47 | 47 |
48 | 48 |
49 bool OpenFirstRunDialog(Profile* profile, | 49 bool OpenFirstRunDialog(Profile* profile, |
50 bool homepage_defined, | 50 bool homepage_defined, |
51 int import_items, | 51 int import_items, |
52 int dont_import_items, | 52 int dont_import_items, |
53 bool search_engine_experiment, | 53 bool search_engine_experiment, |
| 54 bool randomize_search_engine_experiment, |
54 ProcessSingleton* process_singleton) { | 55 ProcessSingleton* process_singleton) { |
55 FirstRunController* controller = new FirstRunController; | 56 FirstRunController* controller = new FirstRunController; |
56 return controller->DoFirstRun(profile, process_singleton); | 57 return controller->DoFirstRun(profile, process_singleton); |
57 } | 58 } |
58 | 59 |
59 bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir, | 60 bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir, |
60 MasterPrefs* out_prefs) { | 61 MasterPrefs* out_prefs) { |
61 // TODO(jeremy,viettrungluu): http://crbug.com/44901 | 62 // TODO(jeremy,viettrungluu): http://crbug.com/44901 |
62 NOTIMPLEMENTED(); | 63 NOTIMPLEMENTED(); |
63 return true; | 64 return true; |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
147 GetSourceProfileInfoAt([dialog.get() browserImportSelectedIndex]); | 148 GetSourceProfileInfoAt([dialog.get() browserImportSelectedIndex]); |
148 int16 items = source_profile.services_supported; | 149 int16 items = source_profile.services_supported; |
149 // TODO(port): Do the actual import in a new process like Windows. | 150 // TODO(port): Do the actual import in a new process like Windows. |
150 ignore_result(gc.release()); | 151 ignore_result(gc.release()); |
151 StartImportingWithUI(nil, items, importer_host_.get(), | 152 StartImportingWithUI(nil, items, importer_host_.get(), |
152 source_profile, profile, this, true); | 153 source_profile, profile, this, true); |
153 } | 154 } |
154 | 155 |
155 return true; | 156 return true; |
156 } | 157 } |
OLD | NEW |