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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 #include "chrome/browser/chrome_browser_main_extra_parts.h" | 49 #include "chrome/browser/chrome_browser_main_extra_parts.h" |
50 #include "chrome/browser/component_updater/cld_component_installer.h" | 50 #include "chrome/browser/component_updater/cld_component_installer.h" |
51 #include "chrome/browser/component_updater/ev_whitelist_component_installer.h" | 51 #include "chrome/browser/component_updater/ev_whitelist_component_installer.h" |
52 #include "chrome/browser/component_updater/flash_component_installer.h" | 52 #include "chrome/browser/component_updater/flash_component_installer.h" |
53 #include "chrome/browser/component_updater/recovery_component_installer.h" | 53 #include "chrome/browser/component_updater/recovery_component_installer.h" |
54 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h
" | 54 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h
" |
55 #include "chrome/browser/component_updater/swiftshader_component_installer.h" | 55 #include "chrome/browser/component_updater/swiftshader_component_installer.h" |
56 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" | 56 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" |
57 #include "chrome/browser/defaults.h" | 57 #include "chrome/browser/defaults.h" |
58 #include "chrome/browser/first_run/first_run.h" | 58 #include "chrome/browser/first_run/first_run.h" |
59 #include "chrome/browser/first_run/upgrade_util.h" | |
60 #include "chrome/browser/gpu/gl_string_manager.h" | 59 #include "chrome/browser/gpu/gl_string_manager.h" |
61 #include "chrome/browser/gpu/three_d_api_observer.h" | 60 #include "chrome/browser/gpu/three_d_api_observer.h" |
62 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 61 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
63 #include "chrome/browser/memory/tab_manager.h" | 62 #include "chrome/browser/memory/tab_manager.h" |
64 #include "chrome/browser/metrics/field_trial_synchronizer.h" | 63 #include "chrome/browser/metrics/field_trial_synchronizer.h" |
65 #include "chrome/browser/metrics/metrics_services_manager.h" | 64 #include "chrome/browser/metrics/metrics_services_manager.h" |
66 #include "chrome/browser/metrics/thread_watcher.h" | 65 #include "chrome/browser/metrics/thread_watcher.h" |
67 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" | 66 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" |
68 #include "chrome/browser/net/crl_set_fetcher.h" | 67 #include "chrome/browser/net/crl_set_fetcher.h" |
69 #include "chrome/browser/performance_monitor/performance_monitor.h" | 68 #include "chrome/browser/performance_monitor/performance_monitor.h" |
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
202 #include "base/mac/scoped_nsautorelease_pool.h" | 201 #include "base/mac/scoped_nsautorelease_pool.h" |
203 #include "chrome/browser/mac/keystone_glue.h" | 202 #include "chrome/browser/mac/keystone_glue.h" |
204 #endif // defined(OS_MACOSX) | 203 #endif // defined(OS_MACOSX) |
205 | 204 |
206 #if !defined(OS_IOS) | 205 #if !defined(OS_IOS) |
207 #include "chrome/browser/ui/app_modal/chrome_javascript_native_dialog_factory.h" | 206 #include "chrome/browser/ui/app_modal/chrome_javascript_native_dialog_factory.h" |
208 #include "chrome/common/media/media_resource_provider.h" | 207 #include "chrome/common/media/media_resource_provider.h" |
209 #include "media/base/media_resources.h" | 208 #include "media/base/media_resources.h" |
210 #endif // !defined(OS_IOS) | 209 #endif // !defined(OS_IOS) |
211 | 210 |
| 211 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| 212 #include "chrome/browser/first_run/upgrade_util.h" |
| 213 #endif |
| 214 |
212 #if !defined(DISABLE_NACL) | 215 #if !defined(DISABLE_NACL) |
213 #include "chrome/browser/component_updater/pnacl_component_installer.h" | 216 #include "chrome/browser/component_updater/pnacl_component_installer.h" |
214 #include "components/nacl/browser/nacl_process_host.h" | 217 #include "components/nacl/browser/nacl_process_host.h" |
215 #endif // !defined(DISABLE_NACL) | 218 #endif // !defined(DISABLE_NACL) |
216 | 219 |
217 #if defined(ENABLE_EXTENSIONS) | 220 #if defined(ENABLE_EXTENSIONS) |
218 #include "chrome/browser/extensions/startup_helper.h" | 221 #include "chrome/browser/extensions/startup_helper.h" |
219 #include "extensions/browser/extension_protocols.h" | 222 #include "extensions/browser/extension_protocols.h" |
220 #include "extensions/common/features/feature_provider.h" | 223 #include "extensions/common/features/feature_provider.h" |
221 #include "extensions/components/javascript_dialog_extensions_client/javascript_d
ialog_extension_client_impl.h" | 224 #include "extensions/components/javascript_dialog_extensions_client/javascript_d
ialog_extension_client_impl.h" |
(...skipping 1619 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1841 chromeos::CrosSettings::Shutdown(); | 1844 chromeos::CrosSettings::Shutdown(); |
1842 #endif // defined(OS_CHROMEOS) | 1845 #endif // defined(OS_CHROMEOS) |
1843 #endif // defined(OS_ANDROID) | 1846 #endif // defined(OS_ANDROID) |
1844 } | 1847 } |
1845 | 1848 |
1846 // Public members: | 1849 // Public members: |
1847 | 1850 |
1848 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1851 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1849 chrome_extra_parts_.push_back(parts); | 1852 chrome_extra_parts_.push_back(parts); |
1850 } | 1853 } |
OLD | NEW |