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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
118 #include "components/content_settings/core/browser/host_content_settings_map.h" | 118 #include "components/content_settings/core/browser/host_content_settings_map.h" |
119 #include "components/content_settings/core/common/content_settings.h" | 119 #include "components/content_settings/core/common/content_settings.h" |
120 #include "components/content_settings/core/common/content_settings_types.h" | 120 #include "components/content_settings/core/common/content_settings_types.h" |
121 #include "components/data_reduction_proxy/content/browser/data_reduction_proxy_m
essage_filter.h" | 121 #include "components/data_reduction_proxy/content/browser/data_reduction_proxy_m
essage_filter.h" |
122 #include "components/dom_distiller/core/dom_distiller_switches.h" | 122 #include "components/dom_distiller/core/dom_distiller_switches.h" |
123 #include "components/dom_distiller/core/url_constants.h" | 123 #include "components/dom_distiller/core/url_constants.h" |
124 #include "components/error_page/common/error_page_switches.h" | 124 #include "components/error_page/common/error_page_switches.h" |
125 #include "components/google/core/browser/google_util.h" | 125 #include "components/google/core/browser/google_util.h" |
126 #include "components/metrics/client_info.h" | 126 #include "components/metrics/client_info.h" |
127 #include "components/net_log/chrome_net_log.h" | 127 #include "components/net_log/chrome_net_log.h" |
| 128 #include "components/page_load_metrics/browser/metrics_navigation_throttle.h" |
128 #include "components/pref_registry/pref_registry_syncable.h" | 129 #include "components/pref_registry/pref_registry_syncable.h" |
129 #include "components/prefs/pref_service.h" | 130 #include "components/prefs/pref_service.h" |
130 #include "components/prefs/scoped_user_pref_update.h" | 131 #include "components/prefs/scoped_user_pref_update.h" |
131 #include "components/rappor/rappor_utils.h" | 132 #include "components/rappor/rappor_utils.h" |
132 #include "components/security_interstitials/core/ssl_error_ui.h" | 133 #include "components/security_interstitials/core/ssl_error_ui.h" |
133 #include "components/signin/core/common/profile_management_switches.h" | 134 #include "components/signin/core/common/profile_management_switches.h" |
134 #include "components/startup_metric_utils/browser/startup_metric_host_impl.h" | 135 #include "components/startup_metric_utils/browser/startup_metric_host_impl.h" |
135 #include "components/translate/core/common/translate_switches.h" | 136 #include "components/translate/core/common/translate_switches.h" |
136 #include "components/url_formatter/url_fixer.h" | 137 #include "components/url_formatter/url_fixer.h" |
137 #include "components/variations/variations_associated_data.h" | 138 #include "components/variations/variations_associated_data.h" |
(...skipping 2829 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2967 } | 2968 } |
2968 } | 2969 } |
2969 } | 2970 } |
2970 #endif | 2971 #endif |
2971 | 2972 |
2972 #if defined(ENABLE_EXTENSIONS) | 2973 #if defined(ENABLE_EXTENSIONS) |
2973 if (!handle->IsInMainFrame()) | 2974 if (!handle->IsInMainFrame()) |
2974 throttles.push_back(new extensions::ExtensionNavigationThrottle(handle)); | 2975 throttles.push_back(new extensions::ExtensionNavigationThrottle(handle)); |
2975 #endif | 2976 #endif |
2976 | 2977 |
| 2978 if (handle->IsInMainFrame()) { |
| 2979 throttles.push_back( |
| 2980 page_load_metrics::MetricsNavigationThrottle::Create(handle)); |
| 2981 } |
| 2982 |
2977 return throttles; | 2983 return throttles; |
2978 } | 2984 } |
2979 | 2985 |
2980 content::DevToolsManagerDelegate* | 2986 content::DevToolsManagerDelegate* |
2981 ChromeContentBrowserClient::GetDevToolsManagerDelegate() { | 2987 ChromeContentBrowserClient::GetDevToolsManagerDelegate() { |
2982 return new ChromeDevToolsManagerDelegate(); | 2988 return new ChromeDevToolsManagerDelegate(); |
2983 } | 2989 } |
2984 | 2990 |
2985 content::TracingDelegate* ChromeContentBrowserClient::GetTracingDelegate() { | 2991 content::TracingDelegate* ChromeContentBrowserClient::GetTracingDelegate() { |
2986 return new ChromeTracingDelegate(); | 2992 return new ChromeTracingDelegate(); |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3044 if (channel <= kMaxDisableEncryptionChannel) { | 3050 if (channel <= kMaxDisableEncryptionChannel) { |
3045 static const char* const kWebRtcDevSwitchNames[] = { | 3051 static const char* const kWebRtcDevSwitchNames[] = { |
3046 switches::kDisableWebRtcEncryption, | 3052 switches::kDisableWebRtcEncryption, |
3047 }; | 3053 }; |
3048 to_command_line->CopySwitchesFrom(from_command_line, | 3054 to_command_line->CopySwitchesFrom(from_command_line, |
3049 kWebRtcDevSwitchNames, | 3055 kWebRtcDevSwitchNames, |
3050 arraysize(kWebRtcDevSwitchNames)); | 3056 arraysize(kWebRtcDevSwitchNames)); |
3051 } | 3057 } |
3052 } | 3058 } |
3053 #endif // defined(ENABLE_WEBRTC) | 3059 #endif // defined(ENABLE_WEBRTC) |
OLD | NEW |