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/chrome_browser_main.h" | 5 #include "chrome/browser/chrome_browser_main.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 25 matching lines...) Expand all Loading... |
36 #include "base/time/time.h" | 36 #include "base/time/time.h" |
37 #include "base/values.h" | 37 #include "base/values.h" |
38 #include "build/build_config.h" | 38 #include "build/build_config.h" |
39 #include "chrome/browser/about_flags.h" | 39 #include "chrome/browser/about_flags.h" |
40 #include "chrome/browser/browser_process.h" | 40 #include "chrome/browser/browser_process.h" |
41 #include "chrome/browser/browser_process_impl.h" | 41 #include "chrome/browser/browser_process_impl.h" |
42 #include "chrome/browser/browser_process_platform_part.h" | 42 #include "chrome/browser/browser_process_platform_part.h" |
43 #include "chrome/browser/browser_shutdown.h" | 43 #include "chrome/browser/browser_shutdown.h" |
44 #include "chrome/browser/chrome_browser_main_extra_parts.h" | 44 #include "chrome/browser/chrome_browser_main_extra_parts.h" |
45 #include "chrome/browser/component_updater/cld_component_installer.h" | 45 #include "chrome/browser/component_updater/cld_component_installer.h" |
46 #include "chrome/browser/component_updater/component_updater_service.h" | |
47 #include "chrome/browser/component_updater/ev_whitelist_component_installer.h" | 46 #include "chrome/browser/component_updater/ev_whitelist_component_installer.h" |
48 #include "chrome/browser/component_updater/flash_component_installer.h" | 47 #include "chrome/browser/component_updater/flash_component_installer.h" |
49 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" | 48 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" |
50 #include "chrome/browser/component_updater/recovery_component_installer.h" | 49 #include "chrome/browser/component_updater/recovery_component_installer.h" |
51 #include "chrome/browser/component_updater/swiftshader_component_installer.h" | 50 #include "chrome/browser/component_updater/swiftshader_component_installer.h" |
52 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" | 51 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" |
53 #include "chrome/browser/defaults.h" | 52 #include "chrome/browser/defaults.h" |
54 #include "chrome/browser/extensions/extension_service.h" | 53 #include "chrome/browser/extensions/extension_service.h" |
55 #include "chrome/browser/extensions/startup_helper.h" | 54 #include "chrome/browser/extensions/startup_helper.h" |
56 #include "chrome/browser/first_run/first_run.h" | 55 #include "chrome/browser/first_run/first_run.h" |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 #include "chrome/common/chrome_paths.h" | 95 #include "chrome/common/chrome_paths.h" |
97 #include "chrome/common/chrome_result_codes.h" | 96 #include "chrome/common/chrome_result_codes.h" |
98 #include "chrome/common/chrome_switches.h" | 97 #include "chrome/common/chrome_switches.h" |
99 #include "chrome/common/crash_keys.h" | 98 #include "chrome/common/crash_keys.h" |
100 #include "chrome/common/env_vars.h" | 99 #include "chrome/common/env_vars.h" |
101 #include "chrome/common/logging_chrome.h" | 100 #include "chrome/common/logging_chrome.h" |
102 #include "chrome/common/net/net_resource_provider.h" | 101 #include "chrome/common/net/net_resource_provider.h" |
103 #include "chrome/common/pref_names.h" | 102 #include "chrome/common/pref_names.h" |
104 #include "chrome/common/profiling.h" | 103 #include "chrome/common/profiling.h" |
105 #include "chrome/installer/util/google_update_settings.h" | 104 #include "chrome/installer/util/google_update_settings.h" |
| 105 #include "components/component_updater/component_updater_service.h" |
106 #include "components/google/core/browser/google_util.h" | 106 #include "components/google/core/browser/google_util.h" |
107 #include "components/language_usage_metrics/language_usage_metrics.h" | 107 #include "components/language_usage_metrics/language_usage_metrics.h" |
108 #include "components/metrics/metrics_service.h" | 108 #include "components/metrics/metrics_service.h" |
109 #include "components/nacl/browser/nacl_browser.h" | 109 #include "components/nacl/browser/nacl_browser.h" |
110 #include "components/rappor/rappor_service.h" | 110 #include "components/rappor/rappor_service.h" |
111 #include "components/signin/core/common/profile_management_switches.h" | 111 #include "components/signin/core/common/profile_management_switches.h" |
112 #include "components/startup_metric_utils/startup_metric_utils.h" | 112 #include "components/startup_metric_utils/startup_metric_utils.h" |
113 #include "components/translate/content/common/cld_data_source.h" | 113 #include "components/translate/content/common/cld_data_source.h" |
114 #include "components/translate/core/browser/translate_download_manager.h" | 114 #include "components/translate/core/browser/translate_download_manager.h" |
115 #include "components/variations/variations_http_header_provider.h" | 115 #include "components/variations/variations_http_header_provider.h" |
(...skipping 1547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1663 chromeos::CrosSettings::Shutdown(); | 1663 chromeos::CrosSettings::Shutdown(); |
1664 #endif | 1664 #endif |
1665 #endif | 1665 #endif |
1666 } | 1666 } |
1667 | 1667 |
1668 // Public members: | 1668 // Public members: |
1669 | 1669 |
1670 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1670 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1671 chrome_extra_parts_.push_back(parts); | 1671 chrome_extra_parts_.push_back(parts); |
1672 } | 1672 } |
OLD | NEW |