| 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 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 bool ContentClient::AllowScriptExtensionForServiceWorker( | 129 bool ContentClient::AllowScriptExtensionForServiceWorker( |
| 130 const GURL& script_url) { | 130 const GURL& script_url) { |
| 131 return false; | 131 return false; |
| 132 } | 132 } |
| 133 | 133 |
| 134 #if defined(OS_ANDROID) | 134 #if defined(OS_ANDROID) |
| 135 bool ContentClient::UsingSynchronousCompositing() { | 135 bool ContentClient::UsingSynchronousCompositing() { |
| 136 return false; | 136 return false; |
| 137 } | 137 } |
| 138 | 138 |
| 139 media::MediaClientAndroid* ContentClient::GetMediaClientAndroid() { | 139 media::MediaDrmBridgeClient* ContentClient::GetMediaDrmBridgeClient() { |
| 140 return nullptr; | 140 return nullptr; |
| 141 } | 141 } |
| 142 #endif // OS_ANDROID | 142 #endif // OS_ANDROID |
| 143 | 143 |
| 144 } // namespace content | 144 } // namespace content |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2756333002:
Rename MediaClientAndroid to MediaDrmBridgeClient (Closed)
