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 24 matching lines...) Expand all Loading... |
35 #include "base/threading/platform_thread.h" | 35 #include "base/threading/platform_thread.h" |
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" | |
46 #include "chrome/browser/component_updater/component_updater_service.h" | 45 #include "chrome/browser/component_updater/component_updater_service.h" |
47 #include "chrome/browser/component_updater/flash_component_installer.h" | 46 #include "chrome/browser/component_updater/flash_component_installer.h" |
48 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" | 47 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" |
49 #include "chrome/browser/component_updater/recovery_component_installer.h" | 48 #include "chrome/browser/component_updater/recovery_component_installer.h" |
50 #include "chrome/browser/component_updater/swiftshader_component_installer.h" | 49 #include "chrome/browser/component_updater/swiftshader_component_installer.h" |
51 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" | 50 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" |
52 #include "chrome/browser/defaults.h" | 51 #include "chrome/browser/defaults.h" |
53 #include "chrome/browser/extensions/extension_service.h" | 52 #include "chrome/browser/extensions/extension_service.h" |
54 #include "chrome/browser/extensions/startup_helper.h" | 53 #include "chrome/browser/extensions/startup_helper.h" |
55 #include "chrome/browser/first_run/first_run.h" | 54 #include "chrome/browser/first_run/first_run.h" |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
177 #include "ui/gfx/win/dpi.h" | 176 #include "ui/gfx/win/dpi.h" |
178 #endif // defined(OS_WIN) | 177 #endif // defined(OS_WIN) |
179 | 178 |
180 #if defined(OS_MACOSX) | 179 #if defined(OS_MACOSX) |
181 #include <Security/Security.h> | 180 #include <Security/Security.h> |
182 | 181 |
183 #include "base/mac/scoped_nsautorelease_pool.h" | 182 #include "base/mac/scoped_nsautorelease_pool.h" |
184 #include "chrome/browser/mac/keystone_glue.h" | 183 #include "chrome/browser/mac/keystone_glue.h" |
185 #endif | 184 #endif |
186 | 185 |
| 186 #if defined(CLD_DATA_FROM_COMPONENT) |
| 187 #include "chrome/browser/component_updater/cld_component_installer.h" |
| 188 #endif |
| 189 |
187 #if defined(ENABLE_FULL_PRINTING) && !defined(OFFICIAL_BUILD) | 190 #if defined(ENABLE_FULL_PRINTING) && !defined(OFFICIAL_BUILD) |
188 #include "printing/printed_document.h" | 191 #include "printing/printed_document.h" |
189 #endif | 192 #endif |
190 | 193 |
191 #if defined(ENABLE_RLZ) | 194 #if defined(ENABLE_RLZ) |
192 #include "chrome/browser/rlz/rlz.h" | 195 #include "chrome/browser/rlz/rlz.h" |
193 #endif | 196 #endif |
194 | 197 |
195 #if defined(ENABLE_WEBRTC) | 198 #if defined(ENABLE_WEBRTC) |
196 #include "chrome/browser/media/webrtc_log_util.h" | 199 #include "chrome/browser/media/webrtc_log_util.h" |
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
397 // CRLSetFetcher attempts to load a CRL set from either the local disk or | 400 // CRLSetFetcher attempts to load a CRL set from either the local disk or |
398 // network. | 401 // network. |
399 if (!command_line.HasSwitch(switches::kDisableCRLSets)) | 402 if (!command_line.HasSwitch(switches::kDisableCRLSets)) |
400 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus); | 403 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus); |
401 #elif defined(OS_ANDROID) | 404 #elif defined(OS_ANDROID) |
402 // The CRLSet component was enabled for some releases. This code attempts to | 405 // The CRLSet component was enabled for some releases. This code attempts to |
403 // delete it from the local disk of those how may have downloaded it. | 406 // delete it from the local disk of those how may have downloaded it. |
404 g_browser_process->crl_set_fetcher()->DeleteFromDisk(); | 407 g_browser_process->crl_set_fetcher()->DeleteFromDisk(); |
405 #endif | 408 #endif |
406 | 409 |
407 #if defined(CLD2_DYNAMIC_MODE) && defined(CLD2_IS_COMPONENT) | 410 #if defined(CLD_DATA_FROM_COMPONENT) |
408 RegisterCldComponent(cus); | 411 RegisterCldComponent(cus); |
409 #endif | 412 #endif |
410 | 413 |
411 #if defined(OS_WIN) | 414 #if defined(OS_WIN) |
412 ExecutePendingSwReporter(cus, g_browser_process->local_state()); | 415 ExecutePendingSwReporter(cus, g_browser_process->local_state()); |
413 #endif | 416 #endif |
414 | 417 |
415 cus->Start(); | 418 cus->Start(); |
416 } | 419 } |
417 | 420 |
(...skipping 1236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1654 chromeos::CrosSettings::Shutdown(); | 1657 chromeos::CrosSettings::Shutdown(); |
1655 #endif | 1658 #endif |
1656 #endif | 1659 #endif |
1657 } | 1660 } |
1658 | 1661 |
1659 // Public members: | 1662 // Public members: |
1660 | 1663 |
1661 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1664 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1662 chrome_extra_parts_.push_back(parts); | 1665 chrome_extra_parts_.push_back(parts); |
1663 } | 1666 } |
OLD | NEW |