chrome/common/chrome_content_client.cc - Issue 1741783002: Add disabled origin trial feature list

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/common/chrome_content_client.cc

Issue 1741783002: Add disabled origin trial feature list (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ef-finch

Patch Set: Rebase; fix after crrev.com/cb60e703 landed Created 4 years, 7 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:

Index: chrome/common/chrome_content_client.cc

diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc

index 571d73729fbadfa4ca26481182d17fb1d53e655b..929ca5d3ddadbbac594441e19297fd4da7adc686 100644

--- a/chrome/common/chrome_content_client.cc

+++ b/chrome/common/chrome_content_client.cc

@@ -702,6 +702,11 @@ base::StringPiece ChromeContentClient::GetOriginTrialPublicKey() {

return origin_trial_key_manager_.GetPublicKey();

}

+bool ChromeContentClient::IsOriginTrialFeatureDisabled(

+ base::StringPiece feature) {

+ return origin_trial_key_manager_.IsFeatureDisabled(feature);

#if defined(OS_ANDROID)

media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() {

return new ChromeMediaClientAndroid();