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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
74 #include "chrome/browser/search/instant_service.h" | 74 #include "chrome/browser/search/instant_service.h" |
75 #include "chrome/browser/search/instant_service_factory.h" | 75 #include "chrome/browser/search/instant_service_factory.h" |
76 #include "chrome/browser/search/search.h" | 76 #include "chrome/browser/search/search.h" |
77 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" | 77 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" |
78 #include "chrome/browser/speech/tts_controller.h" | 78 #include "chrome/browser/speech/tts_controller.h" |
79 #include "chrome/browser/speech/tts_message_filter.h" | 79 #include "chrome/browser/speech/tts_message_filter.h" |
80 #include "chrome/browser/ssl/ssl_blocking_page.h" | 80 #include "chrome/browser/ssl/ssl_blocking_page.h" |
81 #include "chrome/browser/ssl/ssl_cert_reporter.h" | 81 #include "chrome/browser/ssl/ssl_cert_reporter.h" |
82 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" | 82 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" |
83 #include "chrome/browser/ssl/ssl_error_handler.h" | 83 #include "chrome/browser/ssl/ssl_error_handler.h" |
84 #include "chrome/browser/subresource_filter/navigation_throttle_util.h" | |
84 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h" | 85 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h" |
85 #include "chrome/browser/tab_contents/tab_util.h" | 86 #include "chrome/browser/tab_contents/tab_util.h" |
86 #include "chrome/browser/tracing/chrome_tracing_delegate.h" | 87 #include "chrome/browser/tracing/chrome_tracing_delegate.h" |
87 #include "chrome/browser/translate/chrome_translate_client.h" | 88 #include "chrome/browser/translate/chrome_translate_client.h" |
88 #include "chrome/browser/ui/blocked_content/blocked_window_params.h" | 89 #include "chrome/browser/ui/blocked_content/blocked_window_params.h" |
89 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" | 90 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" |
90 #include "chrome/browser/ui/browser_navigator.h" | 91 #include "chrome/browser/ui/browser_navigator.h" |
91 #include "chrome/browser/ui/browser_navigator_params.h" | 92 #include "chrome/browser/ui/browser_navigator_params.h" |
92 #include "chrome/browser/ui/chrome_select_file_policy.h" | 93 #include "chrome/browser/ui/chrome_select_file_policy.h" |
93 #include "chrome/browser/ui/sync/sync_promo_ui.h" | 94 #include "chrome/browser/ui/sync/sync_promo_ui.h" |
(...skipping 3196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3290 } | 3291 } |
3291 } | 3292 } |
3292 } | 3293 } |
3293 #endif | 3294 #endif |
3294 | 3295 |
3295 #if BUILDFLAG(ENABLE_EXTENSIONS) | 3296 #if BUILDFLAG(ENABLE_EXTENSIONS) |
3296 throttles.push_back( | 3297 throttles.push_back( |
3297 base::MakeUnique<extensions::ExtensionNavigationThrottle>(handle)); | 3298 base::MakeUnique<extensions::ExtensionNavigationThrottle>(handle)); |
3298 #endif | 3299 #endif |
3299 | 3300 |
3301 std::unique_ptr<content::NavigationThrottle> | |
3302 subresource_filter_activation_throttle = | |
3303 MaybeCreateSubresourceFilterNavigationThrottle( | |
vakh (use Gerrit instead)
2017/02/22 22:55:42
nit: you don't need the temporary std::unique_ptr
| |
3304 handle, g_browser_process->safe_browsing_service()); | |
3305 if (subresource_filter_activation_throttle) | |
3306 throttles.push_back(std::move(subresource_filter_activation_throttle)); | |
3307 | |
3300 return throttles; | 3308 return throttles; |
3301 } | 3309 } |
3302 | 3310 |
3303 std::unique_ptr<content::NavigationUIData> | 3311 std::unique_ptr<content::NavigationUIData> |
3304 ChromeContentBrowserClient::GetNavigationUIData( | 3312 ChromeContentBrowserClient::GetNavigationUIData( |
3305 content::NavigationHandle* navigation_handle) { | 3313 content::NavigationHandle* navigation_handle) { |
3306 return base::MakeUnique<ChromeNavigationUIData>(navigation_handle); | 3314 return base::MakeUnique<ChromeNavigationUIData>(navigation_handle); |
3307 } | 3315 } |
3308 | 3316 |
3309 content::DevToolsManagerDelegate* | 3317 content::DevToolsManagerDelegate* |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3434 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { | 3442 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { |
3435 return variations::GetVariationParamValue( | 3443 return variations::GetVariationParamValue( |
3436 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; | 3444 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; |
3437 } | 3445 } |
3438 | 3446 |
3439 // static | 3447 // static |
3440 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( | 3448 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( |
3441 const storage::QuotaSettings* settings) { | 3449 const storage::QuotaSettings* settings) { |
3442 g_default_quota_settings = settings; | 3450 g_default_quota_settings = settings; |
3443 } | 3451 } |
OLD | NEW |