| 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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  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::AllowScriptExtensionForServiceWorker( | 
 |  127     const GURL& script_url) { | 
 |  128   return false; | 
 |  129 } | 
 |  130  | 
|  126 #if defined(OS_ANDROID) |  131 #if defined(OS_ANDROID) | 
|  127 bool ContentClient::UsingSynchronousCompositing() { |  132 bool ContentClient::UsingSynchronousCompositing() { | 
|  128   return false; |  133   return false; | 
|  129 } |  134 } | 
|  130  |  135  | 
|  131 media::MediaClientAndroid* ContentClient::GetMediaClientAndroid() { |  136 media::MediaClientAndroid* ContentClient::GetMediaClientAndroid() { | 
|  132   return nullptr; |  137   return nullptr; | 
|  133 } |  138 } | 
|  134 #endif  // OS_ANDROID |  139 #endif  // OS_ANDROID | 
|  135  |  140  | 
|  136 }  // namespace content |  141 }  // namespace content | 
| OLD | NEW |