Chromium Code Reviews| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 43 #include "chrome/browser/after_startup_task_utils.h" | 43 #include "chrome/browser/after_startup_task_utils.h" |
| 44 #include "chrome/browser/browser_process.h" | 44 #include "chrome/browser/browser_process.h" |
| 45 #include "chrome/browser/browser_process_impl.h" | 45 #include "chrome/browser/browser_process_impl.h" |
| 46 #include "chrome/browser/browser_process_platform_part.h" | 46 #include "chrome/browser/browser_process_platform_part.h" |
| 47 #include "chrome/browser/browser_shutdown.h" | 47 #include "chrome/browser/browser_shutdown.h" |
| 48 #include "chrome/browser/chrome_browser_main_extra_parts.h" | 48 #include "chrome/browser/chrome_browser_main_extra_parts.h" |
| 49 #include "chrome/browser/component_updater/cld_component_installer.h" | 49 #include "chrome/browser/component_updater/cld_component_installer.h" |
| 50 #include "chrome/browser/component_updater/ev_whitelist_component_installer.h" | 50 #include "chrome/browser/component_updater/ev_whitelist_component_installer.h" |
| 51 #include "chrome/browser/component_updater/flash_component_installer.h" | 51 #include "chrome/browser/component_updater/flash_component_installer.h" |
| 52 #include "chrome/browser/component_updater/recovery_component_installer.h" | 52 #include "chrome/browser/component_updater/recovery_component_installer.h" |
| 53 #include "chrome/browser/component_updater/sth_set_component_installer.h" | |
| 53 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h " | 54 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h " |
| 54 #include "chrome/browser/component_updater/swiftshader_component_installer.h" | 55 #include "chrome/browser/component_updater/swiftshader_component_installer.h" |
| 55 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" | 56 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" |
| 56 #include "chrome/browser/defaults.h" | 57 #include "chrome/browser/defaults.h" |
| 57 #include "chrome/browser/first_run/first_run.h" | 58 #include "chrome/browser/first_run/first_run.h" |
| 58 #include "chrome/browser/gpu/gl_string_manager.h" | 59 #include "chrome/browser/gpu/gl_string_manager.h" |
| 59 #include "chrome/browser/gpu/three_d_api_observer.h" | 60 #include "chrome/browser/gpu/three_d_api_observer.h" |
| 60 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 61 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
| 61 #include "chrome/browser/memory/tab_manager.h" | 62 #include "chrome/browser/memory/tab_manager.h" |
| 62 #include "chrome/browser/metrics/field_trial_synchronizer.h" | 63 #include "chrome/browser/metrics/field_trial_synchronizer.h" |
| (...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 481 g_browser_process->crl_set_fetcher()->DeleteFromDisk(path); | 482 g_browser_process->crl_set_fetcher()->DeleteFromDisk(path); |
| 482 #elif !defined(OS_CHROMEOS) | 483 #elif !defined(OS_CHROMEOS) |
| 483 // CRLSetFetcher attempts to load a CRL set from either the local disk or | 484 // CRLSetFetcher attempts to load a CRL set from either the local disk or |
| 484 // network. | 485 // network. |
| 485 // For Chrome OS this registration is delayed until user login. | 486 // For Chrome OS this registration is delayed until user login. |
| 486 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus, path); | 487 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus, path); |
| 487 // Registration of the EV Whitelist component here is not necessary for: | 488 // Registration of the EV Whitelist component here is not necessary for: |
| 488 // 1. Android: Because it currently does not have the EV indicator. | 489 // 1. Android: Because it currently does not have the EV indicator. |
| 489 // 2. Chrome OS: On Chrome OS this registration is delayed until user login. | 490 // 2. Chrome OS: On Chrome OS this registration is delayed until user login. |
| 490 RegisterEVWhitelistComponent(cus, path); | 491 RegisterEVWhitelistComponent(cus, path); |
| 492 | |
| 493 // Registration of the STH set fetcher here is not done for: | |
| 494 // Android: Because the story around CT on Mobile is not finalized yet. | |
| 495 // Chrome OS: On Chrome OS this registration is delayed until user login. | |
| 496 RegisterSTHSetComponent(cus, path); | |
| 491 #endif // defined(OS_ANDROID) | 497 #endif // defined(OS_ANDROID) |
| 492 } | 498 } |
| 493 | 499 |
| 494 #if defined(OS_WIN) | 500 #if defined(OS_WIN) |
| 495 #if defined(GOOGLE_CHROME_BUILD) | 501 #if defined(GOOGLE_CHROME_BUILD) |
| 496 RegisterSwReporterComponent(cus); | 502 RegisterSwReporterComponent(cus); |
| 497 #endif // defined(GOOGLE_CHROME_BUILD) | 503 #endif // defined(GOOGLE_CHROME_BUILD) |
| 498 RegisterCAPSComponent(cus); | 504 RegisterCAPSComponent(cus); |
| 499 #endif // defined(OS_WIN) | 505 #endif // defined(OS_WIN) |
| 500 } | 506 } |
| (...skipping 1193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1694 // Instantiate the notification UI manager, as this triggers a perf timer | 1700 // Instantiate the notification UI manager, as this triggers a perf timer |
| 1695 // used to measure startup time. TODO(stevenjb): Figure out what is actually | 1701 // used to measure startup time. TODO(stevenjb): Figure out what is actually |
| 1696 // triggering the timer and call that explicitly in the approprate place. | 1702 // triggering the timer and call that explicitly in the approprate place. |
| 1697 // http://crbug.com/105065. | 1703 // http://crbug.com/105065. |
| 1698 browser_process_->notification_ui_manager(); | 1704 browser_process_->notification_ui_manager(); |
| 1699 | 1705 |
| 1700 // This must be called prior to RegisterComponentsForUpdate, in case the CLD | 1706 // This must be called prior to RegisterComponentsForUpdate, in case the CLD |
| 1701 // data source is based on the Component Updater. | 1707 // data source is based on the Component Updater. |
| 1702 translate::BrowserCldUtils::ConfigureDefaultDataProvider(); | 1708 translate::BrowserCldUtils::ConfigureDefaultDataProvider(); |
| 1703 | 1709 |
| 1704 if (!parsed_command_line().HasSwitch(switches::kDisableComponentUpdate)) | 1710 if (!parsed_command_line().HasSwitch(switches::kDisableComponentUpdate)) { |
|
waffles
2016/04/07 13:30:49
Our style thus far has been to elide the braces fo
Eran Messeri
2016/04/07 16:37:59
My bad, done.
| |
| 1705 RegisterComponentsForUpdate(); | 1711 RegisterComponentsForUpdate(); |
| 1712 } | |
| 1706 | 1713 |
| 1707 #if defined(OS_ANDROID) | 1714 #if defined(OS_ANDROID) |
| 1708 variations::VariationsService* variations_service = | 1715 variations::VariationsService* variations_service = |
| 1709 browser_process_->variations_service(); | 1716 browser_process_->variations_service(); |
| 1710 if (variations_service) { | 1717 if (variations_service) { |
| 1711 // Just initialize the policy prefs service here. Variations seed fetching | 1718 // Just initialize the policy prefs service here. Variations seed fetching |
| 1712 // will be initialized when the app enters foreground mode. | 1719 // will be initialized when the app enters foreground mode. |
| 1713 variations_service->set_policy_pref_service(profile_->GetPrefs()); | 1720 variations_service->set_policy_pref_service(profile_->GetPrefs()); |
| 1714 } | 1721 } |
| 1715 translate::TranslateDownloadManager::RequestLanguageList( | 1722 translate::TranslateDownloadManager::RequestLanguageList( |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1941 chromeos::CrosSettings::Shutdown(); | 1948 chromeos::CrosSettings::Shutdown(); |
| 1942 #endif // defined(OS_CHROMEOS) | 1949 #endif // defined(OS_CHROMEOS) |
| 1943 #endif // defined(OS_ANDROID) | 1950 #endif // defined(OS_ANDROID) |
| 1944 } | 1951 } |
| 1945 | 1952 |
| 1946 // Public members: | 1953 // Public members: |
| 1947 | 1954 |
| 1948 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1955 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1949 chrome_extra_parts_.push_back(parts); | 1956 chrome_extra_parts_.push_back(parts); |
| 1950 } | 1957 } |
| OLD | NEW |