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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 #include "chrome/browser/search/instant_service.h" | 76 #include "chrome/browser/search/instant_service.h" |
77 #include "chrome/browser/search/instant_service_factory.h" | 77 #include "chrome/browser/search/instant_service_factory.h" |
78 #include "chrome/browser/search/search.h" | 78 #include "chrome/browser/search/search.h" |
79 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" | 79 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" |
80 #include "chrome/browser/speech/tts_controller.h" | 80 #include "chrome/browser/speech/tts_controller.h" |
81 #include "chrome/browser/speech/tts_message_filter.h" | 81 #include "chrome/browser/speech/tts_message_filter.h" |
82 #include "chrome/browser/ssl/ssl_blocking_page.h" | 82 #include "chrome/browser/ssl/ssl_blocking_page.h" |
83 #include "chrome/browser/ssl/ssl_cert_reporter.h" | 83 #include "chrome/browser/ssl/ssl_cert_reporter.h" |
84 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" | 84 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" |
85 #include "chrome/browser/ssl/ssl_error_handler.h" | 85 #include "chrome/browser/ssl/ssl_error_handler.h" |
| 86 #include "chrome/browser/subresource_filter/subresource_filter_navigation_trottl
e_util.h" |
86 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h" | 87 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h" |
87 #include "chrome/browser/tab_contents/tab_util.h" | 88 #include "chrome/browser/tab_contents/tab_util.h" |
88 #include "chrome/browser/tracing/chrome_tracing_delegate.h" | 89 #include "chrome/browser/tracing/chrome_tracing_delegate.h" |
89 #include "chrome/browser/translate/chrome_translate_client.h" | 90 #include "chrome/browser/translate/chrome_translate_client.h" |
90 #include "chrome/browser/ui/blocked_content/blocked_window_params.h" | 91 #include "chrome/browser/ui/blocked_content/blocked_window_params.h" |
91 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" | 92 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" |
92 #include "chrome/browser/ui/browser_navigator.h" | 93 #include "chrome/browser/ui/browser_navigator.h" |
93 #include "chrome/browser/ui/browser_navigator_params.h" | 94 #include "chrome/browser/ui/browser_navigator_params.h" |
94 #include "chrome/browser/ui/chrome_select_file_policy.h" | 95 #include "chrome/browser/ui/chrome_select_file_policy.h" |
95 #include "chrome/browser/ui/sync/sync_promo_ui.h" | 96 #include "chrome/browser/ui/sync/sync_promo_ui.h" |
(...skipping 3184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3280 } | 3281 } |
3281 } | 3282 } |
3282 } | 3283 } |
3283 #endif | 3284 #endif |
3284 | 3285 |
3285 #if BUILDFLAG(ENABLE_EXTENSIONS) | 3286 #if BUILDFLAG(ENABLE_EXTENSIONS) |
3286 throttles.push_back( | 3287 throttles.push_back( |
3287 base::MakeUnique<extensions::ExtensionNavigationThrottle>(handle)); | 3288 base::MakeUnique<extensions::ExtensionNavigationThrottle>(handle)); |
3288 #endif | 3289 #endif |
3289 | 3290 |
| 3291 std::unique_ptr<content::NavigationThrottle> |
| 3292 subresource_filter_activation_throttle = |
| 3293 MaybeCreateSubresourceFilterNavigationThrottle( |
| 3294 handle, g_browser_process->safe_browsing_service()); |
| 3295 if (subresource_filter_activation_throttle) |
| 3296 throttles.push_back(std::move(subresource_filter_activation_throttle)); |
| 3297 |
3290 return throttles; | 3298 return throttles; |
3291 } | 3299 } |
3292 | 3300 |
3293 std::unique_ptr<content::NavigationUIData> | 3301 std::unique_ptr<content::NavigationUIData> |
3294 ChromeContentBrowserClient::GetNavigationUIData( | 3302 ChromeContentBrowserClient::GetNavigationUIData( |
3295 content::NavigationHandle* navigation_handle) { | 3303 content::NavigationHandle* navigation_handle) { |
3296 return base::MakeUnique<ChromeNavigationUIData>(navigation_handle); | 3304 return base::MakeUnique<ChromeNavigationUIData>(navigation_handle); |
3297 } | 3305 } |
3298 | 3306 |
3299 content::DevToolsManagerDelegate* | 3307 content::DevToolsManagerDelegate* |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3418 bool ChromeContentBrowserClient::ShouldRedirectDOMStorageTaskRunner() { | 3426 bool ChromeContentBrowserClient::ShouldRedirectDOMStorageTaskRunner() { |
3419 return variations::GetVariationParamValue( | 3427 return variations::GetVariationParamValue( |
3420 "BrowserScheduler", "RedirectDOMStorageTaskRunner") == "true"; | 3428 "BrowserScheduler", "RedirectDOMStorageTaskRunner") == "true"; |
3421 } | 3429 } |
3422 | 3430 |
3423 bool ChromeContentBrowserClient:: | 3431 bool ChromeContentBrowserClient:: |
3424 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { | 3432 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { |
3425 return variations::GetVariationParamValue( | 3433 return variations::GetVariationParamValue( |
3426 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; | 3434 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; |
3427 } | 3435 } |
OLD | NEW |