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 15 matching lines...) Expand all Loading... |
26 #include "base/string_number_conversions.h" | 26 #include "base/string_number_conversions.h" |
27 #include "base/string_piece.h" | 27 #include "base/string_piece.h" |
28 #include "base/string_split.h" | 28 #include "base/string_split.h" |
29 #include "base/string_util.h" | 29 #include "base/string_util.h" |
30 #include "base/sys_string_conversions.h" | 30 #include "base/sys_string_conversions.h" |
31 #include "base/thread_restrictions.h" | 31 #include "base/thread_restrictions.h" |
32 #include "base/time.h" | 32 #include "base/time.h" |
33 #include "base/utf_string_conversions.h" | 33 #include "base/utf_string_conversions.h" |
34 #include "base/values.h" | 34 #include "base/values.h" |
35 #include "build/build_config.h" | 35 #include "build/build_config.h" |
36 #include "chrome/browser/browser.h" | |
37 #include "chrome/browser/browser_main_win.h" | 36 #include "chrome/browser/browser_main_win.h" |
38 #include "chrome/browser/prefs/browser_prefs.h" | 37 #include "chrome/browser/prefs/browser_prefs.h" |
39 #include "chrome/browser/browser_process.h" | 38 #include "chrome/browser/browser_process.h" |
40 #include "chrome/browser/browser_process_impl.h" | 39 #include "chrome/browser/browser_process_impl.h" |
41 #include "chrome/browser/browser_shutdown.h" | 40 #include "chrome/browser/browser_shutdown.h" |
42 #include "chrome/browser/browser_thread.h" | 41 #include "chrome/browser/browser_thread.h" |
43 #include "chrome/browser/dom_ui/chrome_url_data_manager.h" | 42 #include "chrome/browser/dom_ui/chrome_url_data_manager.h" |
44 #include "chrome/browser/extensions/extension_protocols.h" | 43 #include "chrome/browser/extensions/extension_protocols.h" |
45 #include "chrome/browser/extensions/extensions_service.h" | 44 #include "chrome/browser/extensions/extensions_service.h" |
46 #include "chrome/browser/extensions/extensions_startup.h" | 45 #include "chrome/browser/extensions/extensions_startup.h" |
(...skipping 15 matching lines...) Expand all Loading... |
62 #include "chrome/browser/profile.h" | 61 #include "chrome/browser/profile.h" |
63 #include "chrome/browser/profile_manager.h" | 62 #include "chrome/browser/profile_manager.h" |
64 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" | 63 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" |
65 #include "chrome/browser/search_engines/search_engine_type.h" | 64 #include "chrome/browser/search_engines/search_engine_type.h" |
66 #include "chrome/browser/search_engines/template_url.h" | 65 #include "chrome/browser/search_engines/template_url.h" |
67 #include "chrome/browser/search_engines/template_url_model.h" | 66 #include "chrome/browser/search_engines/template_url_model.h" |
68 #include "chrome/browser/service/service_process_control.h" | 67 #include "chrome/browser/service/service_process_control.h" |
69 #include "chrome/browser/service/service_process_control_manager.h" | 68 #include "chrome/browser/service/service_process_control_manager.h" |
70 #include "chrome/browser/shell_integration.h" | 69 #include "chrome/browser/shell_integration.h" |
71 #include "chrome/browser/translate/translate_manager.h" | 70 #include "chrome/browser/translate/translate_manager.h" |
| 71 #include "chrome/browser/ui/browser.h" |
72 #include "chrome/browser/ui/browser_init.h" | 72 #include "chrome/browser/ui/browser_init.h" |
73 #include "chrome/common/child_process.h" | 73 #include "chrome/common/child_process.h" |
74 #include "chrome/common/chrome_constants.h" | 74 #include "chrome/common/chrome_constants.h" |
75 #include "chrome/common/chrome_paths.h" | 75 #include "chrome/common/chrome_paths.h" |
76 #include "chrome/common/chrome_switches.h" | 76 #include "chrome/common/chrome_switches.h" |
77 #include "chrome/common/env_vars.h" | 77 #include "chrome/common/env_vars.h" |
78 #include "chrome/common/json_pref_store.h" | 78 #include "chrome/common/json_pref_store.h" |
79 #include "chrome/common/jstemplate_builder.h" | 79 #include "chrome/common/jstemplate_builder.h" |
80 #include "chrome/common/logging_chrome.h" | 80 #include "chrome/common/logging_chrome.h" |
81 #include "chrome/common/main_function_params.h" | 81 #include "chrome/common/main_function_params.h" |
(...skipping 1581 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1663 metrics->Stop(); | 1663 metrics->Stop(); |
1664 | 1664 |
1665 // browser_shutdown takes care of deleting browser_process, so we need to | 1665 // browser_shutdown takes care of deleting browser_process, so we need to |
1666 // release it. | 1666 // release it. |
1667 ignore_result(browser_process.release()); | 1667 ignore_result(browser_process.release()); |
1668 browser_shutdown::Shutdown(); | 1668 browser_shutdown::Shutdown(); |
1669 | 1669 |
1670 TRACE_EVENT_END("BrowserMain", 0, 0); | 1670 TRACE_EVENT_END("BrowserMain", 0, 0); |
1671 return result_code; | 1671 return result_code; |
1672 } | 1672 } |
OLD | NEW |