| 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 #ifndef CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ | 5 #ifndef CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ |
| 6 #define CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ | 6 #define CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 int* sandbox_profile_resource_id) const override; | 94 int* sandbox_profile_resource_id) const override; |
| 95 #endif | 95 #endif |
| 96 | 96 |
| 97 bool AllowScriptExtensionForServiceWorker(const GURL& script_url) override; | 97 bool AllowScriptExtensionForServiceWorker(const GURL& script_url) override; |
| 98 | 98 |
| 99 bool IsSupplementarySiteIsolationModeEnabled() override; | 99 bool IsSupplementarySiteIsolationModeEnabled() override; |
| 100 | 100 |
| 101 content::OriginTrialPolicy* GetOriginTrialPolicy() override; | 101 content::OriginTrialPolicy* GetOriginTrialPolicy() override; |
| 102 | 102 |
| 103 #if defined(OS_ANDROID) | 103 #if defined(OS_ANDROID) |
| 104 media::MediaClientAndroid* GetMediaClientAndroid() override; | 104 media::MediaDrmBridgeClient* GetMediaDrmBridgeClient() override; |
| 105 #endif // OS_ANDROID | 105 #endif // OS_ANDROID |
| 106 | 106 |
| 107 private: | 107 private: |
| 108 std::unique_ptr<ChromeOriginTrialPolicy> origin_trial_policy_; | 108 std::unique_ptr<ChromeOriginTrialPolicy> origin_trial_policy_; |
| 109 }; | 109 }; |
| 110 | 110 |
| 111 #endif // CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ | 111 #endif // CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2756333002:
Rename MediaClientAndroid to MediaDrmBridgeClient (Closed)
