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

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

Issue 2238383002: Add SafeBrowsingNavigationThrottle Base URL: https://chromium.googlesource.com/chromium/src.git@unsafe-resource-to-webcontents
Patch Set: . Created 4 years, 4 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
« no previous file with comments | « no previous file | chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 #include "chrome/browser/prerender/prerender_final_status.h" 60 #include "chrome/browser/prerender/prerender_final_status.h"
61 #include "chrome/browser/prerender/prerender_manager.h" 61 #include "chrome/browser/prerender/prerender_manager.h"
62 #include "chrome/browser/prerender/prerender_manager_factory.h" 62 #include "chrome/browser/prerender/prerender_manager_factory.h"
63 #include "chrome/browser/prerender/prerender_message_filter.h" 63 #include "chrome/browser/prerender/prerender_message_filter.h"
64 #include "chrome/browser/printing/printing_message_filter.h" 64 #include "chrome/browser/printing/printing_message_filter.h"
65 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h" 65 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h"
66 #include "chrome/browser/profiles/profile.h" 66 #include "chrome/browser/profiles/profile.h"
67 #include "chrome/browser/profiles/profile_io_data.h" 67 #include "chrome/browser/profiles/profile_io_data.h"
68 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" 68 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
69 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory .h" 69 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory .h"
70 #include "chrome/browser/renderer_host/safe_browsing_navigation_throttle.h"
70 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 71 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
71 #include "chrome/browser/safe_browsing/ui_manager.h" 72 #include "chrome/browser/safe_browsing/ui_manager.h"
72 #include "chrome/browser/search/instant_service.h" 73 #include "chrome/browser/search/instant_service.h"
73 #include "chrome/browser/search/instant_service_factory.h" 74 #include "chrome/browser/search/instant_service_factory.h"
74 #include "chrome/browser/search/search.h" 75 #include "chrome/browser/search/search.h"
75 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" 76 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h"
76 #include "chrome/browser/speech/tts_controller.h" 77 #include "chrome/browser/speech/tts_controller.h"
77 #include "chrome/browser/speech/tts_message_filter.h" 78 #include "chrome/browser/speech/tts_message_filter.h"
78 #include "chrome/browser/ssl/ssl_add_certificate.h" 79 #include "chrome/browser/ssl/ssl_add_certificate.h"
79 #include "chrome/browser/ssl/ssl_blocking_page.h" 80 #include "chrome/browser/ssl/ssl_blocking_page.h"
(...skipping 2878 matching lines...) Expand 10 before | Expand all | Expand 10 after
2958 if (!prerender_contents) { 2959 if (!prerender_contents) {
2959 auto intent_picker_cb = base::Bind(ShowIntentPickerBubble()); 2960 auto intent_picker_cb = base::Bind(ShowIntentPickerBubble());
2960 auto url_to_arc_throttle = base::MakeUnique<arc::ArcNavigationThrottle>( 2961 auto url_to_arc_throttle = base::MakeUnique<arc::ArcNavigationThrottle>(
2961 handle, intent_picker_cb); 2962 handle, intent_picker_cb);
2962 throttles.push_back(std::move(url_to_arc_throttle)); 2963 throttles.push_back(std::move(url_to_arc_throttle));
2963 } 2964 }
2964 } 2965 }
2965 } 2966 }
2966 #endif 2967 #endif
2967 2968
2969 #if defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE)
2970 if (handle->IsInMainFrame()) {
2971 auto sb_throttle = SafeBrowsingNavigationThrottle::MaybeCreate(
2972 handle, g_browser_process->safe_browsing_service());
2973 if (sb_throttle) {
2974 throttles.push_back(std::move(sb_throttle));
2975 }
2976 }
2977 #endif // defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE)
2978
2968 #if defined(ENABLE_EXTENSIONS) 2979 #if defined(ENABLE_EXTENSIONS)
2969 if (!handle->IsInMainFrame()) 2980 if (!handle->IsInMainFrame())
2970 throttles.push_back(new extensions::ExtensionNavigationThrottle(handle)); 2981 throttles.push_back(new extensions::ExtensionNavigationThrottle(handle));
2971 #endif 2982 #endif
2972 2983
2973 subresource_filter::ContentSubresourceFilterDriverFactory* 2984 subresource_filter::ContentSubresourceFilterDriverFactory*
2974 subresource_filter_driver_factory = 2985 subresource_filter_driver_factory =
2975 subresource_filter::ContentSubresourceFilterDriverFactory:: 2986 subresource_filter::ContentSubresourceFilterDriverFactory::
2976 FromWebContents(handle->GetWebContents()); 2987 FromWebContents(handle->GetWebContents());
2977 if (subresource_filter_driver_factory && handle->IsInMainFrame() && 2988 if (subresource_filter_driver_factory && handle->IsInMainFrame() &&
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
3054 if (channel <= kMaxDisableEncryptionChannel) { 3065 if (channel <= kMaxDisableEncryptionChannel) {
3055 static const char* const kWebRtcDevSwitchNames[] = { 3066 static const char* const kWebRtcDevSwitchNames[] = {
3056 switches::kDisableWebRtcEncryption, 3067 switches::kDisableWebRtcEncryption,
3057 }; 3068 };
3058 to_command_line->CopySwitchesFrom(from_command_line, 3069 to_command_line->CopySwitchesFrom(from_command_line,
3059 kWebRtcDevSwitchNames, 3070 kWebRtcDevSwitchNames,
3060 arraysize(kWebRtcDevSwitchNames)); 3071 arraysize(kWebRtcDevSwitchNames));
3061 } 3072 }
3062 } 3073 }
3063 #endif // defined(ENABLE_WEBRTC) 3074 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698