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 "content/public/common/content_client.h" | 15 #include "content/public/common/content_client.h" |
15 | 16 |
16 #if defined(ENABLE_PLUGINS) | 17 #if defined(ENABLE_PLUGINS) |
17 #include "content/public/common/pepper_plugin_info.h" | 18 #include "content/public/common/pepper_plugin_info.h" |
18 #endif | 19 #endif |
19 | 20 |
20 #include "url/url_util.h" | 21 #include "url/url_util.h" |
21 | 22 |
22 // Returns the user agent of Chrome. | 23 // Returns the user agent of Chrome. |
23 std::string GetUserAgent(); | 24 std::string GetUserAgent(); |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
79 int sandbox_type, | 80 int sandbox_type, |
80 int* sandbox_profile_resource_id) const override; | 81 int* sandbox_profile_resource_id) const override; |
81 #endif | 82 #endif |
82 | 83 |
83 void AddSecureSchemesAndOrigins(std::set<std::string>* schemes, | 84 void AddSecureSchemesAndOrigins(std::set<std::string>* schemes, |
84 std::set<GURL>* origins) override; | 85 std::set<GURL>* origins) override; |
85 | 86 |
86 void AddServiceWorkerSchemes(std::set<std::string>* schemes) override; | 87 void AddServiceWorkerSchemes(std::set<std::string>* schemes) override; |
87 | 88 |
88 bool IsSupplementarySiteIsolationModeEnabled() override; | 89 bool IsSupplementarySiteIsolationModeEnabled() override; |
| 90 base::StringPiece GetOriginTrialPublicKey() override; |
| 91 |
| 92 private: |
| 93 OriginTrialKeyManager origin_trial_key_manager_; |
89 }; | 94 }; |
90 | 95 |
91 #endif // CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ | 96 #endif // CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ |
OLD | NEW |