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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 #include "chrome/browser/permissions/permission_context_base.h" | 59 #include "chrome/browser/permissions/permission_context_base.h" |
60 #include "chrome/browser/platform_util.h" | 60 #include "chrome/browser/platform_util.h" |
61 #include "chrome/browser/prerender/prerender_final_status.h" | 61 #include "chrome/browser/prerender/prerender_final_status.h" |
62 #include "chrome/browser/prerender/prerender_manager.h" | 62 #include "chrome/browser/prerender/prerender_manager.h" |
63 #include "chrome/browser/prerender/prerender_manager_factory.h" | 63 #include "chrome/browser/prerender/prerender_manager_factory.h" |
64 #include "chrome/browser/prerender/prerender_message_filter.h" | 64 #include "chrome/browser/prerender/prerender_message_filter.h" |
65 #include "chrome/browser/printing/printing_message_filter.h" | 65 #include "chrome/browser/printing/printing_message_filter.h" |
66 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h" | 66 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h" |
67 #include "chrome/browser/profiles/profile.h" | 67 #include "chrome/browser/profiles/profile.h" |
68 #include "chrome/browser/profiles/profile_io_data.h" | 68 #include "chrome/browser/profiles/profile_io_data.h" |
| 69 #include "chrome/browser/renderer_host/chrome_navigation_ui_data.h" |
69 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" | 70 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" |
70 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory
.h" | 71 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory
.h" |
71 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 72 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
72 #include "chrome/browser/safe_browsing/ui_manager.h" | 73 #include "chrome/browser/safe_browsing/ui_manager.h" |
73 #include "chrome/browser/search/instant_service.h" | 74 #include "chrome/browser/search/instant_service.h" |
74 #include "chrome/browser/search/instant_service_factory.h" | 75 #include "chrome/browser/search/instant_service_factory.h" |
75 #include "chrome/browser/search/search.h" | 76 #include "chrome/browser/search/search.h" |
76 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" | 77 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" |
77 #include "chrome/browser/speech/tts_controller.h" | 78 #include "chrome/browser/speech/tts_controller.h" |
78 #include "chrome/browser/speech/tts_message_filter.h" | 79 #include "chrome/browser/speech/tts_message_filter.h" |
(...skipping 3077 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3156 // WebContentsObserver, once ReadyToCommitNavigation is available on | 3157 // WebContentsObserver, once ReadyToCommitNavigation is available on |
3157 // pre-PlzNavigate world (tracking bug: https://crbug.com/621856). | 3158 // pre-PlzNavigate world (tracking bug: https://crbug.com/621856). |
3158 throttles.push_back( | 3159 throttles.push_back( |
3159 subresource_filter::SubresourceFilterNavigationThrottle::Create( | 3160 subresource_filter::SubresourceFilterNavigationThrottle::Create( |
3160 handle)); | 3161 handle)); |
3161 } | 3162 } |
3162 | 3163 |
3163 return throttles; | 3164 return throttles; |
3164 } | 3165 } |
3165 | 3166 |
| 3167 std::unique_ptr<content::NavigationUIData> |
| 3168 ChromeContentBrowserClient::GetNavigationUIData( |
| 3169 content::NavigationHandle* navigation_handle) { |
| 3170 return base::MakeUnique<ChromeNavigationUIData>(navigation_handle); |
| 3171 } |
| 3172 |
3166 content::DevToolsManagerDelegate* | 3173 content::DevToolsManagerDelegate* |
3167 ChromeContentBrowserClient::GetDevToolsManagerDelegate() { | 3174 ChromeContentBrowserClient::GetDevToolsManagerDelegate() { |
3168 #if defined(OS_ANDROID) | 3175 #if defined(OS_ANDROID) |
3169 return new DevToolsManagerDelegateAndroid(); | 3176 return new DevToolsManagerDelegateAndroid(); |
3170 #else | 3177 #else |
3171 return new ChromeDevToolsManagerDelegate(); | 3178 return new ChromeDevToolsManagerDelegate(); |
3172 #endif | 3179 #endif |
3173 } | 3180 } |
3174 | 3181 |
3175 content::TracingDelegate* ChromeContentBrowserClient::GetTracingDelegate() { | 3182 content::TracingDelegate* ChromeContentBrowserClient::GetTracingDelegate() { |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3233 if (channel <= kMaxDisableEncryptionChannel) { | 3240 if (channel <= kMaxDisableEncryptionChannel) { |
3234 static const char* const kWebRtcDevSwitchNames[] = { | 3241 static const char* const kWebRtcDevSwitchNames[] = { |
3235 switches::kDisableWebRtcEncryption, | 3242 switches::kDisableWebRtcEncryption, |
3236 }; | 3243 }; |
3237 to_command_line->CopySwitchesFrom(from_command_line, | 3244 to_command_line->CopySwitchesFrom(from_command_line, |
3238 kWebRtcDevSwitchNames, | 3245 kWebRtcDevSwitchNames, |
3239 arraysize(kWebRtcDevSwitchNames)); | 3246 arraysize(kWebRtcDevSwitchNames)); |
3240 } | 3247 } |
3241 } | 3248 } |
3242 #endif // defined(ENABLE_WEBRTC) | 3249 #endif // defined(ENABLE_WEBRTC) |
OLD | NEW |