Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(227)

Side by Side Diff: content/public/common/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, 6 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 unified diff | Download patch
OLDNEW
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 "content/public/common/content_client.h" 5 #include "content/public/common/content_client.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/string_piece.h" 8 #include "base/strings/string_piece.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "content/public/common/origin_util.h" 10 #include "content/public/common/origin_util.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 #endif 116 #endif
117 117
118 bool ContentClient::IsSupplementarySiteIsolationModeEnabled() { 118 bool ContentClient::IsSupplementarySiteIsolationModeEnabled() {
119 return false; 119 return false;
120 } 120 }
121 121
122 base::StringPiece ContentClient::GetOriginTrialPublicKey() { 122 base::StringPiece ContentClient::GetOriginTrialPublicKey() {
123 return base::StringPiece(); 123 return base::StringPiece();
124 } 124 }
125 125
126 bool ContentClient::IsOriginTrialFeatureDisabled(base::StringPiece feature) {
127 return false;
128 }
129
126 bool ContentClient::AllowScriptExtensionForServiceWorker( 130 bool ContentClient::AllowScriptExtensionForServiceWorker(
127 const GURL& script_url) { 131 const GURL& script_url) {
128 return false; 132 return false;
129 } 133 }
130 134
131 #if defined(OS_ANDROID) 135 #if defined(OS_ANDROID)
132 bool ContentClient::UsingSynchronousCompositing() { 136 bool ContentClient::UsingSynchronousCompositing() {
133 return false; 137 return false;
134 } 138 }
135 139
136 media::MediaClientAndroid* ContentClient::GetMediaClientAndroid() { 140 media::MediaClientAndroid* ContentClient::GetMediaClientAndroid() {
137 return nullptr; 141 return nullptr;
138 } 142 }
139 #endif // OS_ANDROID 143 #endif // OS_ANDROID
140 144
141 } // namespace content 145 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698