chrome/browser/chrome_browser_main.cc - Issue 1887743003: Allow the component updater framework to control Origin Trials.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 1887743003: Allow the component updater framework to control Origin Trials. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ef-finch

Patch Set: Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « no previous file | chrome/browser/component_updater/origin_trials_component_installer.h » ('j') | chrome/browser/component_updater/origin_trials_component_installer.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chrome_browser_main.cc

diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc

index 5fd3d13bcecf419f0ae900136b6c89c63ef36a66..9a292031a23d8326df87e97b69cb3da4c1f40105 100644

--- a/chrome/browser/chrome_browser_main.cc

+++ b/chrome/browser/chrome_browser_main.cc

@@ -48,6 +48,7 @@

#include "chrome/browser/chrome_browser_main_extra_parts.h"

#include "chrome/browser/component_updater/cld_component_installer.h"

#include "chrome/browser/component_updater/ev_whitelist_component_installer.h"

+#include "chrome/browser/component_updater/origin_trials_component_installer.h"

#include "chrome/browser/component_updater/pepper_flash_component_installer.h"

#include "chrome/browser/component_updater/recovery_component_installer.h"

#include "chrome/browser/component_updater/sth_set_component_installer.h"

@@ -495,6 +496,7 @@ void RegisterComponentsForUpdate() {

// Chrome OS: On Chrome OS this registration is delayed until user login.

RegisterSTHSetComponent(cus, path);

#endif // defined(OS_ANDROID)

+ RegisterOriginTrialsComponent(cus, path);

}

#if defined(OS_WIN)