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

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

Issue 2645283007: Add the client for accessing Subresource Filter only list. (Closed)
Patch Set: only changes specific to this cl Created 3 years, 9 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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 3314 matching lines...) Expand 10 before | Expand all | Expand 10 after
3408 } 3409 }
3409 } 3410 }
3410 } 3411 }
3411 #endif 3412 #endif
3412 3413
3413 #if BUILDFLAG(ENABLE_EXTENSIONS) 3414 #if BUILDFLAG(ENABLE_EXTENSIONS)
3414 throttles.push_back( 3415 throttles.push_back(
3415 base::MakeUnique<extensions::ExtensionNavigationThrottle>(handle)); 3416 base::MakeUnique<extensions::ExtensionNavigationThrottle>(handle));
3416 #endif 3417 #endif
3417 3418
3419 content::NavigationThrottle* subresource_filter_activation_throttle =
3420 MaybeCreateSubresourceFilterNavigationThrottle(
3421 handle, g_browser_process->safe_browsing_service());
3422 if (subresource_filter_activation_throttle)
engedy 2017/03/21 13:44:16 nit: {}
melandory 2017/03/24 15:49:27 Done.
3423 throttles.push_back(
3424 base::WrapUnique(subresource_filter_activation_throttle));
3425
3418 return throttles; 3426 return throttles;
3419 } 3427 }
3420 3428
3421 std::unique_ptr<content::NavigationUIData> 3429 std::unique_ptr<content::NavigationUIData>
3422 ChromeContentBrowserClient::GetNavigationUIData( 3430 ChromeContentBrowserClient::GetNavigationUIData(
3423 content::NavigationHandle* navigation_handle) { 3431 content::NavigationHandle* navigation_handle) {
3424 return base::MakeUnique<ChromeNavigationUIData>(navigation_handle); 3432 return base::MakeUnique<ChromeNavigationUIData>(navigation_handle);
3425 } 3433 }
3426 3434
3427 content::DevToolsManagerDelegate* 3435 content::DevToolsManagerDelegate*
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
3552 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { 3560 RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
3553 return variations::GetVariationParamValue( 3561 return variations::GetVariationParamValue(
3554 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; 3562 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
3555 } 3563 }
3556 3564
3557 // static 3565 // static
3558 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( 3566 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
3559 const storage::QuotaSettings* settings) { 3567 const storage::QuotaSettings* settings) {
3560 g_default_quota_settings = settings; 3568 g_default_quota_settings = settings;
3561 } 3569 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698