| 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 "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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 return false; | 114 return false; |
| 115 } | 115 } |
| 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 void ContentClient::InitializeOriginTrialPolicy() {} | 122 void ContentClient::InitializeOriginTrialPolicy() {} |
| 123 | 123 |
| 124 base::StringPiece ContentClient::GetOriginTrialPublicKey() const { | 124 const OriginTrialPolicy* ContentClient::GetOriginTrialPolicy() const { |
| 125 return base::StringPiece(); | 125 return nullptr; |
| 126 } | |
| 127 | |
| 128 bool ContentClient::IsOriginTrialFeatureDisabled( | |
| 129 base::StringPiece feature) const { | |
| 130 return false; | |
| 131 } | 126 } |
| 132 | 127 |
| 133 bool ContentClient::AllowScriptExtensionForServiceWorker( | 128 bool ContentClient::AllowScriptExtensionForServiceWorker( |
| 134 const GURL& script_url) { | 129 const GURL& script_url) { |
| 135 return false; | 130 return false; |
| 136 } | 131 } |
| 137 | 132 |
| 138 #if defined(OS_ANDROID) | 133 #if defined(OS_ANDROID) |
| 139 bool ContentClient::UsingSynchronousCompositing() { | 134 bool ContentClient::UsingSynchronousCompositing() { |
| 140 return false; | 135 return false; |
| 141 } | 136 } |
| 142 | 137 |
| 143 media::MediaClientAndroid* ContentClient::GetMediaClientAndroid() { | 138 media::MediaClientAndroid* ContentClient::GetMediaClientAndroid() { |
| 144 return nullptr; | 139 return nullptr; |
| 145 } | 140 } |
| 146 #endif // OS_ANDROID | 141 #endif // OS_ANDROID |
| 147 | 142 |
| 148 } // namespace content | 143 } // namespace content |
| OLD | NEW |