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 <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
82 #endif | 82 #endif |
83 | 83 |
84 void AddSecureSchemesAndOrigins(std::set<std::string>* schemes, | 84 void AddSecureSchemesAndOrigins(std::set<std::string>* schemes, |
85 std::set<GURL>* origins) override; | 85 std::set<GURL>* origins) override; |
86 | 86 |
87 void AddServiceWorkerSchemes(std::set<std::string>* schemes) override; | 87 void AddServiceWorkerSchemes(std::set<std::string>* schemes) override; |
88 | 88 |
89 bool IsSupplementarySiteIsolationModeEnabled() override; | 89 bool IsSupplementarySiteIsolationModeEnabled() override; |
90 base::StringPiece GetOriginTrialPublicKey() override; | 90 base::StringPiece GetOriginTrialPublicKey() override; |
91 | 91 |
| 92 #if defined(OS_ANDROID) |
| 93 media::MediaClientAndroid* GetMediaClientAndroid() override; |
| 94 #endif // OS_ANDROID |
| 95 |
92 private: | 96 private: |
93 OriginTrialKeyManager origin_trial_key_manager_; | 97 OriginTrialKeyManager origin_trial_key_manager_; |
94 }; | 98 }; |
95 | 99 |
96 #endif // CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ | 100 #endif // CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ |
OLD | NEW |