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 |
11 #include "app/hi_res_timer_manager.h" | 11 #include "app/hi_res_timer_manager.h" |
12 #include "app/l10n_util.h" | 12 #include "app/l10n_util.h" |
13 #include "app/resource_bundle.h" | 13 #include "app/resource_bundle.h" |
14 #include "app/system_monitor.h" | 14 #include "app/system_monitor.h" |
15 #include "base/command_line.h" | 15 #include "base/command_line.h" |
16 #include "base/field_trial.h" | 16 #include "base/field_trial.h" |
17 #include "base/file_util.h" | 17 #include "base/file_util.h" |
18 #include "base/histogram.h" | 18 #include "base/histogram.h" |
19 #include "base/scoped_nsautorelease_pool.h" | 19 #include "base/scoped_nsautorelease_pool.h" |
20 #include "base/path_service.h" | 20 #include "base/path_service.h" |
21 #include "base/platform_thread.h" | 21 #include "base/platform_thread.h" |
22 #include "base/process_util.h" | 22 #include "base/process_util.h" |
23 #include "base/string_number_conversions.h" | 23 #include "base/string_number_conversions.h" |
24 #include "base/string_piece.h" | 24 #include "base/string_piece.h" |
25 #include "base/string_util.h" | 25 #include "base/string_util.h" |
26 #include "base/sys_string_conversions.h" | 26 #include "base/sys_string_conversions.h" |
27 #include "base/time.h" | 27 #include "base/time.h" |
| 28 #include "base/utf_string_conversions.h" |
28 #include "base/values.h" | 29 #include "base/values.h" |
29 #include "build/build_config.h" | 30 #include "build/build_config.h" |
30 #include "chrome/browser/browser.h" | 31 #include "chrome/browser/browser.h" |
31 #include "chrome/browser/browser_main_win.h" | 32 #include "chrome/browser/browser_main_win.h" |
32 #include "chrome/browser/browser_init.h" | 33 #include "chrome/browser/browser_init.h" |
33 #include "chrome/browser/browser_prefs.h" | 34 #include "chrome/browser/browser_prefs.h" |
34 #include "chrome/browser/browser_process.h" | 35 #include "chrome/browser/browser_process.h" |
35 #include "chrome/browser/browser_process_impl.h" | 36 #include "chrome/browser/browser_process_impl.h" |
36 #include "chrome/browser/browser_shutdown.h" | 37 #include "chrome/browser/browser_shutdown.h" |
37 #include "chrome/browser/chrome_thread.h" | 38 #include "chrome/browser/chrome_thread.h" |
(...skipping 1233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1271 | 1272 |
1272 metrics->Stop(); | 1273 metrics->Stop(); |
1273 | 1274 |
1274 // browser_shutdown takes care of deleting browser_process, so we need to | 1275 // browser_shutdown takes care of deleting browser_process, so we need to |
1275 // release it. | 1276 // release it. |
1276 ignore_result(browser_process.release()); | 1277 ignore_result(browser_process.release()); |
1277 browser_shutdown::Shutdown(); | 1278 browser_shutdown::Shutdown(); |
1278 | 1279 |
1279 return result_code; | 1280 return result_code; |
1280 } | 1281 } |
OLD | NEW |