Chromium Code Reviews| Index: chrome/browser/chrome_browser_main.cc |
| diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc |
| index 1fe82adcde3ebbda95389e0ecfc1eb8aee299ac4..8d12d4495715cb38a67081f394a6488b2ee8cf0c 100644 |
| --- a/chrome/browser/chrome_browser_main.cc |
| +++ b/chrome/browser/chrome_browser_main.cc |
| @@ -50,6 +50,7 @@ |
| #include "chrome/browser/component_updater/ev_whitelist_component_installer.h" |
| #include "chrome/browser/component_updater/flash_component_installer.h" |
| #include "chrome/browser/component_updater/recovery_component_installer.h" |
| +#include "chrome/browser/component_updater/sth_set_component_installer.h" |
| #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h" |
| #include "chrome/browser/component_updater/swiftshader_component_installer.h" |
| #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" |
| @@ -488,6 +489,11 @@ void RegisterComponentsForUpdate() { |
| // 1. Android: Because it currently does not have the EV indicator. |
| // 2. Chrome OS: On Chrome OS this registration is delayed until user login. |
| RegisterEVWhitelistComponent(cus, path); |
| + |
| + // Registration of the STH set fetcher here is not done for: |
| + // Android: Because the story around CT on Mobile is not finalized yet. |
| + // Chrome OS: On Chrome OS this registration is delayed until user login. |
| + RegisterSTHSetComponent(cus, path); |
| #endif // defined(OS_ANDROID) |
| } |
| @@ -1701,8 +1707,9 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { |
| // data source is based on the Component Updater. |
| translate::BrowserCldUtils::ConfigureDefaultDataProvider(); |
| - if (!parsed_command_line().HasSwitch(switches::kDisableComponentUpdate)) |
| + 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.
|
| RegisterComponentsForUpdate(); |
| + } |
| #if defined(OS_ANDROID) |
| variations::VariationsService* variations_service = |