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 |
11 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
12 #include "base/files/file_path.h" | 12 #include "base/files/file_path.h" |
13 #include "build/build_config.h" | 13 #include "build/build_config.h" |
14 #include "chrome/common/origin_trials/origin_trial_key_manager.h" | 14 #include "chrome/common/origin_trials/chrome_origin_trial_policy.h" |
15 #include "content/public/common/content_client.h" | 15 #include "content/public/common/content_client.h" |
16 | 16 |
17 #if defined(ENABLE_PLUGINS) | 17 #if defined(ENABLE_PLUGINS) |
18 #include "content/public/common/pepper_plugin_info.h" | 18 #include "content/public/common/pepper_plugin_info.h" |
19 #endif | 19 #endif |
20 | 20 |
21 #include "url/url_util.h" | 21 #include "url/url_util.h" |
22 | 22 |
23 // Returns the user agent of Chrome. | 23 // Returns the user agent of Chrome. |
24 std::string GetUserAgent(); | 24 std::string GetUserAgent(); |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 int* sandbox_profile_resource_id) const override; | 83 int* sandbox_profile_resource_id) const override; |
84 #endif | 84 #endif |
85 | 85 |
86 void AddSecureSchemesAndOrigins(std::set<std::string>* schemes, | 86 void AddSecureSchemesAndOrigins(std::set<std::string>* schemes, |
87 std::set<GURL>* origins) override; | 87 std::set<GURL>* origins) override; |
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; | |
94 | 93 |
95 OriginTrialKeyManager* origin_trial_key_manager() { | 94 void InitializeOriginTrialPolicy() override; |
96 return &origin_trial_key_manager_; | 95 const content::OriginTrialPolicy* GetOriginTrialPolicy() const override; |
97 } | |
98 | 96 |
99 #if defined(OS_ANDROID) | 97 #if defined(OS_ANDROID) |
100 media::MediaClientAndroid* GetMediaClientAndroid() override; | 98 media::MediaClientAndroid* GetMediaClientAndroid() override; |
101 #endif // OS_ANDROID | 99 #endif // OS_ANDROID |
102 | 100 |
103 private: | 101 private: |
104 OriginTrialKeyManager origin_trial_key_manager_; | 102 ChromeOriginTrialPolicy origin_trial_policy_; |
105 }; | 103 }; |
106 | 104 |
107 #endif // CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ | 105 #endif // CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ |
OLD | NEW |