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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 #include "chrome/browser/chrome_net_benchmarking_message_filter.h" | 44 #include "chrome/browser/chrome_net_benchmarking_message_filter.h" |
45 #include "chrome/browser/chrome_quota_permission_context.h" | 45 #include "chrome/browser/chrome_quota_permission_context.h" |
46 #include "chrome/browser/content_settings/cookie_settings_factory.h" | 46 #include "chrome/browser/content_settings/cookie_settings_factory.h" |
47 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" | 47 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" |
48 #include "chrome/browser/content_settings/tab_specific_content_settings.h" | 48 #include "chrome/browser/content_settings/tab_specific_content_settings.h" |
49 #include "chrome/browser/defaults.h" | 49 #include "chrome/browser/defaults.h" |
50 #include "chrome/browser/download/download_prefs.h" | 50 #include "chrome/browser/download/download_prefs.h" |
51 #include "chrome/browser/engagement/site_engagement_eviction_policy.h" | 51 #include "chrome/browser/engagement/site_engagement_eviction_policy.h" |
52 #include "chrome/browser/font_family_cache.h" | 52 #include "chrome/browser/font_family_cache.h" |
53 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h" | 53 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h" |
| 54 #include "chrome/browser/memory/chrome_memory_coordinator_delegate.h" |
54 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h" | 55 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h" |
55 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" | 56 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" |
56 #include "chrome/browser/notifications/platform_notification_service_impl.h" | 57 #include "chrome/browser/notifications/platform_notification_service_impl.h" |
57 #include "chrome/browser/page_load_metrics/metrics_navigation_throttle.h" | 58 #include "chrome/browser/page_load_metrics/metrics_navigation_throttle.h" |
58 #include "chrome/browser/password_manager/chrome_password_manager_client.h" | 59 #include "chrome/browser/password_manager/chrome_password_manager_client.h" |
59 #include "chrome/browser/permissions/permission_context_base.h" | 60 #include "chrome/browser/permissions/permission_context_base.h" |
60 #include "chrome/browser/platform_util.h" | 61 #include "chrome/browser/platform_util.h" |
61 #include "chrome/browser/prerender/prerender_final_status.h" | 62 #include "chrome/browser/prerender/prerender_final_status.h" |
62 #include "chrome/browser/prerender/prerender_manager.h" | 63 #include "chrome/browser/prerender/prerender_manager.h" |
63 #include "chrome/browser/prerender/prerender_manager_factory.h" | 64 #include "chrome/browser/prerender/prerender_manager_factory.h" |
(...skipping 3176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3240 if (channel <= kMaxDisableEncryptionChannel) { | 3241 if (channel <= kMaxDisableEncryptionChannel) { |
3241 static const char* const kWebRtcDevSwitchNames[] = { | 3242 static const char* const kWebRtcDevSwitchNames[] = { |
3242 switches::kDisableWebRtcEncryption, | 3243 switches::kDisableWebRtcEncryption, |
3243 }; | 3244 }; |
3244 to_command_line->CopySwitchesFrom(from_command_line, | 3245 to_command_line->CopySwitchesFrom(from_command_line, |
3245 kWebRtcDevSwitchNames, | 3246 kWebRtcDevSwitchNames, |
3246 arraysize(kWebRtcDevSwitchNames)); | 3247 arraysize(kWebRtcDevSwitchNames)); |
3247 } | 3248 } |
3248 } | 3249 } |
3249 #endif // defined(ENABLE_WEBRTC) | 3250 #endif // defined(ENABLE_WEBRTC) |
| 3251 |
| 3252 std::unique_ptr<content::MemoryCoordinatorDelegate> |
| 3253 ChromeContentBrowserClient::GetMemoryCoordinatorDelegate() { |
| 3254 return memory::ChromeMemoryCoordinatorDelegate::Create(); |
| 3255 } |
OLD | NEW |