Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2335133003: PlzNavigate: support the WebRequest API (Closed)
Patch Set: Addressed comments + changes to NavigationHandleImpl following 2364943002 Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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 3057 matching lines...) Expand 10 before | Expand all | Expand 10 after
3136 // WebContentsObserver, once ReadyToCommitNavigation is available on 3137 // WebContentsObserver, once ReadyToCommitNavigation is available on
3137 // pre-PlzNavigate world (tracking bug: https://crbug.com/621856). 3138 // pre-PlzNavigate world (tracking bug: https://crbug.com/621856).
3138 throttles.push_back( 3139 throttles.push_back(
3139 subresource_filter::SubresourceFilterNavigationThrottle::Create( 3140 subresource_filter::SubresourceFilterNavigationThrottle::Create(
3140 handle)); 3141 handle));
3141 } 3142 }
3142 3143
3143 return throttles; 3144 return throttles;
3144 } 3145 }
3145 3146
3147 std::unique_ptr<content::NavigationUIData>
3148 ChromeContentBrowserClient::GetNavigationUIData(
3149 content::NavigationHandle* navigation_handle) {
3150 return base::MakeUnique<ChromeNavigationUIData>(navigation_handle);
3151 }
3152
3146 content::DevToolsManagerDelegate* 3153 content::DevToolsManagerDelegate*
3147 ChromeContentBrowserClient::GetDevToolsManagerDelegate() { 3154 ChromeContentBrowserClient::GetDevToolsManagerDelegate() {
3148 #if defined(OS_ANDROID) 3155 #if defined(OS_ANDROID)
3149 return new DevToolsManagerDelegateAndroid(); 3156 return new DevToolsManagerDelegateAndroid();
3150 #else 3157 #else
3151 return new ChromeDevToolsManagerDelegate(); 3158 return new ChromeDevToolsManagerDelegate();
3152 #endif 3159 #endif
3153 } 3160 }
3154 3161
3155 content::TracingDelegate* ChromeContentBrowserClient::GetTracingDelegate() { 3162 content::TracingDelegate* ChromeContentBrowserClient::GetTracingDelegate() {
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
3213 if (channel <= kMaxDisableEncryptionChannel) { 3220 if (channel <= kMaxDisableEncryptionChannel) {
3214 static const char* const kWebRtcDevSwitchNames[] = { 3221 static const char* const kWebRtcDevSwitchNames[] = {
3215 switches::kDisableWebRtcEncryption, 3222 switches::kDisableWebRtcEncryption,
3216 }; 3223 };
3217 to_command_line->CopySwitchesFrom(from_command_line, 3224 to_command_line->CopySwitchesFrom(from_command_line,
3218 kWebRtcDevSwitchNames, 3225 kWebRtcDevSwitchNames,
3219 arraysize(kWebRtcDevSwitchNames)); 3226 arraysize(kWebRtcDevSwitchNames));
3220 } 3227 }
3221 } 3228 }
3222 #endif // defined(ENABLE_WEBRTC) 3229 #endif // defined(ENABLE_WEBRTC)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698