| 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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 | 88 |
| 89 void AddServiceWorkerSchemes(std::set<std::string>* schemes) override; | 89 void AddServiceWorkerSchemes(std::set<std::string>* schemes) override; |
| 90 bool AllowScriptExtensionForServiceWorker(const GURL& script_url) override; | 90 bool AllowScriptExtensionForServiceWorker(const GURL& script_url) override; |
| 91 | 91 |
| 92 bool IsSupplementarySiteIsolationModeEnabled() override; | 92 bool IsSupplementarySiteIsolationModeEnabled() override; |
| 93 base::StringPiece GetOriginTrialPublicKey() override; | 93 base::StringPiece GetOriginTrialPublicKey() override; |
| 94 | 94 |
| 95 OriginTrialKeyManager* origin_trial_key_manager() { | 95 OriginTrialKeyManager* origin_trial_key_manager() { |
| 96 return &origin_trial_key_manager_; | 96 return &origin_trial_key_manager_; |
| 97 } | 97 } |
| 98 bool IsOriginTrialFeatureDisabled(base::StringPiece feature) override; |
| 98 | 99 |
| 99 #if defined(OS_ANDROID) | 100 #if defined(OS_ANDROID) |
| 100 media::MediaClientAndroid* GetMediaClientAndroid() override; | 101 media::MediaClientAndroid* GetMediaClientAndroid() override; |
| 101 #endif // OS_ANDROID | 102 #endif // OS_ANDROID |
| 102 | 103 |
| 103 private: | 104 private: |
| 104 OriginTrialKeyManager origin_trial_key_manager_; | 105 OriginTrialKeyManager origin_trial_key_manager_; |
| 105 }; | 106 }; |
| 106 | 107 |
| 107 #endif // CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ | 108 #endif // CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ |
| OLD | NEW |