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 #include "chrome/browser/chrome_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <set> | 8 #include <set> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 23 matching lines...) Expand all Loading... |
34 #include "chrome/browser/character_encoding.h" | 34 #include "chrome/browser/character_encoding.h" |
35 #include "chrome/browser/chrome_content_browser_client_parts.h" | 35 #include "chrome/browser/chrome_content_browser_client_parts.h" |
36 #include "chrome/browser/chrome_net_benchmarking_message_filter.h" | 36 #include "chrome/browser/chrome_net_benchmarking_message_filter.h" |
37 #include "chrome/browser/chrome_quota_permission_context.h" | 37 #include "chrome/browser/chrome_quota_permission_context.h" |
38 #include "chrome/browser/content_settings/cookie_settings_factory.h" | 38 #include "chrome/browser/content_settings/cookie_settings_factory.h" |
39 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" | 39 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" |
40 #include "chrome/browser/content_settings/tab_specific_content_settings.h" | 40 #include "chrome/browser/content_settings/tab_specific_content_settings.h" |
41 #include "chrome/browser/defaults.h" | 41 #include "chrome/browser/defaults.h" |
42 #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h" | 42 #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h" |
43 #include "chrome/browser/download/download_prefs.h" | 43 #include "chrome/browser/download/download_prefs.h" |
| 44 #include "chrome/browser/engagement/site_engagement_eviction_policy.h" |
44 #include "chrome/browser/font_family_cache.h" | 45 #include "chrome/browser/font_family_cache.h" |
45 #include "chrome/browser/geolocation/chrome_access_token_store.h" | 46 #include "chrome/browser/geolocation/chrome_access_token_store.h" |
46 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 47 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
47 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h" | 48 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h" |
48 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" | 49 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" |
49 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h" | 50 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h" |
50 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_fact
ory.h" | 51 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_fact
ory.h" |
51 #include "chrome/browser/notifications/platform_notification_service_impl.h" | 52 #include "chrome/browser/notifications/platform_notification_service_impl.h" |
52 #include "chrome/browser/platform_util.h" | 53 #include "chrome/browser/platform_util.h" |
53 #include "chrome/browser/prerender/prerender_final_status.h" | 54 #include "chrome/browser/prerender/prerender_final_status.h" |
(...skipping 1864 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1918 #endif | 1919 #endif |
1919 | 1920 |
1920 return NULL; | 1921 return NULL; |
1921 } | 1922 } |
1922 | 1923 |
1923 QuotaPermissionContext* | 1924 QuotaPermissionContext* |
1924 ChromeContentBrowserClient::CreateQuotaPermissionContext() { | 1925 ChromeContentBrowserClient::CreateQuotaPermissionContext() { |
1925 return new ChromeQuotaPermissionContext(); | 1926 return new ChromeQuotaPermissionContext(); |
1926 } | 1927 } |
1927 | 1928 |
| 1929 scoped_ptr<storage::QuotaEvictionPolicy> |
| 1930 ChromeContentBrowserClient::GetTemporaryStorageEvictionPolicy( |
| 1931 content::BrowserContext* context) { |
| 1932 return SiteEngagementEvictionPolicy::IsEnabled() |
| 1933 ? make_scoped_ptr(new SiteEngagementEvictionPolicy(context)) |
| 1934 : nullptr; |
| 1935 } |
| 1936 |
1928 void ChromeContentBrowserClient::AllowCertificateError( | 1937 void ChromeContentBrowserClient::AllowCertificateError( |
1929 int render_process_id, | 1938 int render_process_id, |
1930 int render_frame_id, | 1939 int render_frame_id, |
1931 int cert_error, | 1940 int cert_error, |
1932 const net::SSLInfo& ssl_info, | 1941 const net::SSLInfo& ssl_info, |
1933 const GURL& request_url, | 1942 const GURL& request_url, |
1934 ResourceType resource_type, | 1943 ResourceType resource_type, |
1935 bool overridable, | 1944 bool overridable, |
1936 bool strict_enforcement, | 1945 bool strict_enforcement, |
1937 bool expired_previous_decision, | 1946 bool expired_previous_decision, |
(...skipping 809 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2747 if (channel <= kMaxDisableEncryptionChannel) { | 2756 if (channel <= kMaxDisableEncryptionChannel) { |
2748 static const char* const kWebRtcDevSwitchNames[] = { | 2757 static const char* const kWebRtcDevSwitchNames[] = { |
2749 switches::kDisableWebRtcEncryption, | 2758 switches::kDisableWebRtcEncryption, |
2750 }; | 2759 }; |
2751 to_command_line->CopySwitchesFrom(from_command_line, | 2760 to_command_line->CopySwitchesFrom(from_command_line, |
2752 kWebRtcDevSwitchNames, | 2761 kWebRtcDevSwitchNames, |
2753 arraysize(kWebRtcDevSwitchNames)); | 2762 arraysize(kWebRtcDevSwitchNames)); |
2754 } | 2763 } |
2755 } | 2764 } |
2756 #endif // defined(ENABLE_WEBRTC) | 2765 #endif // defined(ENABLE_WEBRTC) |
OLD | NEW |