Chromium Code Reviews| Index: android_webview/browser/aw_browser_context.h |
| diff --git a/android_webview/browser/aw_browser_context.h b/android_webview/browser/aw_browser_context.h |
| index bd6418f170e7d51b1be753522f435d140f52852f..e323bb8bdb8a3e718a5983c07b06439cd7bccf93 100644 |
| --- a/android_webview/browser/aw_browser_context.h |
| +++ b/android_webview/browser/aw_browser_context.h |
| @@ -15,7 +15,9 @@ |
| #include "base/files/file_path.h" |
| #include "base/macros.h" |
| #include "base/memory/ref_counted.h" |
| +#include "components/prefs/pref_member.h" |
| #include "components/visitedlink/browser/visitedlink_delegate.h" |
| +#include "components/web_restrictions/browser/web_restrictions_client.h" |
| #include "content/public/browser/browser_context.h" |
| #include "content/public/browser/content_browser_client.h" |
| #include "net/url_request/url_request_job_factory.h" |
| @@ -58,6 +60,7 @@ namespace prefs { |
| // Used for Kerberos authentication. |
| extern const char kAuthAndroidNegotiateAccountType[]; |
| extern const char kAuthServerWhitelist[]; |
| +extern const char kWebRestrictionsAuthority[]; |
| } // namespace prefs |
| @@ -96,6 +99,7 @@ class AwBrowserContext : public content::BrowserContext, |
| AwMessagePortService* GetMessagePortService(); |
| policy::URLBlacklistManager* GetURLBlacklistManager(); |
| + web_restrictions::WebRestrictionsClient* GetWebRestrictionProvider(); |
| // content::BrowserContext implementation. |
| std::unique_ptr<content::ZoomLevelDelegate> CreateZoomLevelDelegate( |
| @@ -132,6 +136,8 @@ class AwBrowserContext : public content::BrowserContext, |
| private: |
| void InitUserPrefService(); |
| void CreateDataReductionProxyStatisticsIfNecessary(); |
| + void OnWebRestrictionsAuthorityChanged(); |
| + |
| static bool data_reduction_proxy_enabled_; |
| // Delay, in milliseconds, before removing the legacy cache dir. |
| @@ -164,6 +170,9 @@ class AwBrowserContext : public content::BrowserContext, |
| std::unique_ptr<data_reduction_proxy::DataReductionProxyService> |
| data_reduction_proxy_service_; |
| std::unique_ptr<content::PermissionManager> permission_manager_; |
| + std::unique_ptr<web_restrictions::WebRestrictionsClient> |
| + web_restriction_provider_; |
| + StringPrefMember web_restrictions_authority_; |
|
Bernhard Bauer
2016/04/18 14:48:34
You only need a PrefMember if you want to read the
aberent
2016/05/18 20:06:49
Done.
|
| DISALLOW_COPY_AND_ASSIGN(AwBrowserContext); |
| }; |