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" | |
45 #include "chrome/browser/component_updater/component_updater_service.h" | 46 #include "chrome/browser/component_updater/component_updater_service.h" |
46 #include "chrome/browser/component_updater/flash_component_installer.h" | 47 #include "chrome/browser/component_updater/flash_component_installer.h" |
47 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" | 48 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" |
48 #include "chrome/browser/component_updater/recovery_component_installer.h" | 49 #include "chrome/browser/component_updater/recovery_component_installer.h" |
49 #include "chrome/browser/component_updater/swiftshader_component_installer.h" | 50 #include "chrome/browser/component_updater/swiftshader_component_installer.h" |
50 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" | 51 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" |
51 #include "chrome/browser/defaults.h" | 52 #include "chrome/browser/defaults.h" |
52 #include "chrome/browser/extensions/extension_service.h" | 53 #include "chrome/browser/extensions/extension_service.h" |
53 #include "chrome/browser/extensions/startup_helper.h" | 54 #include "chrome/browser/extensions/startup_helper.h" |
54 #include "chrome/browser/feedback/feedback_profile_observer.h" | 55 #include "chrome/browser/feedback/feedback_profile_observer.h" |
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
399 RegisterWidevineCdmComponent(cus); | 400 RegisterWidevineCdmComponent(cus); |
400 #endif | 401 #endif |
401 | 402 |
402 #if !defined(OS_CHROMEOS) | 403 #if !defined(OS_CHROMEOS) |
403 // CRLSetFetcher attempts to load a CRL set from either the local disk or | 404 // CRLSetFetcher attempts to load a CRL set from either the local disk or |
404 // network. | 405 // network. |
405 if (!command_line.HasSwitch(switches::kDisableCRLSets)) | 406 if (!command_line.HasSwitch(switches::kDisableCRLSets)) |
406 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus); | 407 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus); |
407 #endif | 408 #endif |
408 | 409 |
410 #if defined(CLD2_DYNAMIC_MODE) && defined(CLD2_IS_COMPONENT) | |
411 RegisterCldComponent(cus); | |
412 #endif | |
Sorin Jianu
2014/04/18 17:46:14
Maybe keep the empty line above 413.
Andrew Hayden (chromium.org)
2014/04/22 16:10:14
Done.
| |
409 cus->Start(); | 413 cus->Start(); |
410 } | 414 } |
411 | 415 |
412 #if !defined(OS_ANDROID) | 416 #if !defined(OS_ANDROID) |
413 bool ProcessSingletonNotificationCallback( | 417 bool ProcessSingletonNotificationCallback( |
414 const CommandLine& command_line, | 418 const CommandLine& command_line, |
415 const base::FilePath& current_directory) { | 419 const base::FilePath& current_directory) { |
416 // Drop the request if the browser process is already in shutdown path. | 420 // Drop the request if the browser process is already in shutdown path. |
417 if (!g_browser_process || g_browser_process->IsShuttingDown()) | 421 if (!g_browser_process || g_browser_process->IsShuttingDown()) |
418 return false; | 422 return false; |
(...skipping 1293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1712 chromeos::CrosSettings::Shutdown(); | 1716 chromeos::CrosSettings::Shutdown(); |
1713 #endif | 1717 #endif |
1714 #endif | 1718 #endif |
1715 } | 1719 } |
1716 | 1720 |
1717 // Public members: | 1721 // Public members: |
1718 | 1722 |
1719 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1723 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1720 chrome_extra_parts_.push_back(parts); | 1724 chrome_extra_parts_.push_back(parts); |
1721 } | 1725 } |
OLD | NEW |