| 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/browser_main.h" | 5 #include "chrome/browser/browser_main.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 1236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1247 // touches reads preferences. | 1247 // touches reads preferences. |
| 1248 if (is_first_run) { | 1248 if (is_first_run) { |
| 1249 if (!first_run_ui_bypass) { | 1249 if (!first_run_ui_bypass) { |
| 1250 #if defined(OS_WIN) || defined(OS_LINUX) | 1250 #if defined(OS_WIN) || defined(OS_LINUX) |
| 1251 FirstRun::AutoImport(profile, | 1251 FirstRun::AutoImport(profile, |
| 1252 master_prefs.homepage_defined, | 1252 master_prefs.homepage_defined, |
| 1253 master_prefs.do_import_items, | 1253 master_prefs.do_import_items, |
| 1254 master_prefs.dont_import_items, | 1254 master_prefs.dont_import_items, |
| 1255 master_prefs.run_search_engine_experiment, | 1255 master_prefs.run_search_engine_experiment, |
| 1256 master_prefs.randomize_search_engine_experiment, | 1256 master_prefs.randomize_search_engine_experiment, |
| 1257 master_prefs.make_chrome_default, |
| 1257 &process_singleton); | 1258 &process_singleton); |
| 1258 #else | 1259 #else |
| 1259 if (!OpenFirstRunDialog(profile, | 1260 if (!OpenFirstRunDialog(profile, |
| 1260 master_prefs.homepage_defined, | 1261 master_prefs.homepage_defined, |
| 1261 master_prefs.do_import_items, | 1262 master_prefs.do_import_items, |
| 1262 master_prefs.dont_import_items, | 1263 master_prefs.dont_import_items, |
| 1263 master_prefs.run_search_engine_experiment, | 1264 master_prefs.run_search_engine_experiment, |
| 1264 master_prefs.randomize_search_engine_experiment, | 1265 master_prefs.randomize_search_engine_experiment, |
| 1265 &process_singleton)) { | 1266 &process_singleton)) { |
| 1266 return ResultCodes::NORMAL_EXIT; | 1267 return ResultCodes::NORMAL_EXIT; |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1504 metrics->Stop(); | 1505 metrics->Stop(); |
| 1505 | 1506 |
| 1506 // browser_shutdown takes care of deleting browser_process, so we need to | 1507 // browser_shutdown takes care of deleting browser_process, so we need to |
| 1507 // release it. | 1508 // release it. |
| 1508 ignore_result(browser_process.release()); | 1509 ignore_result(browser_process.release()); |
| 1509 browser_shutdown::Shutdown(); | 1510 browser_shutdown::Shutdown(); |
| 1510 | 1511 |
| 1511 TRACE_EVENT_END("BrowserMain", 0, 0); | 1512 TRACE_EVENT_END("BrowserMain", 0, 0); |
| 1512 return result_code; | 1513 return result_code; |
| 1513 } | 1514 } |
| OLD | NEW |