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

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: adressed comments from jwd 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 3315 matching lines...) Expand 10 before | Expand all | Expand 10 after
3409 } 3410 }
3410 } 3411 }
3411 } 3412 }
3412 #endif 3413 #endif
3413 3414
3414 #if BUILDFLAG(ENABLE_EXTENSIONS) 3415 #if BUILDFLAG(ENABLE_EXTENSIONS)
3415 throttles.push_back( 3416 throttles.push_back(
3416 base::MakeUnique<extensions::ExtensionNavigationThrottle>(handle)); 3417 base::MakeUnique<extensions::ExtensionNavigationThrottle>(handle));
3417 #endif 3418 #endif
3418 3419
3420 content::NavigationThrottle* subresource_filter_activation_throttle =
engedy 2017/03/10 14:39:32 nit: Let's make this return a unique_ptr in the fi
melandory 2017/03/15 13:41:35 Look at pachset 5
engedy 2017/03/21 13:44:16 Ping on this.
3421 MaybeCreateSubresourceFilterNavigationThrottle(
3422 handle, g_browser_process->safe_browsing_service());
3423 if (subresource_filter_activation_throttle)
3424 throttles.push_back(
3425 base::WrapUnique(subresource_filter_activation_throttle));
3426
3419 return throttles; 3427 return throttles;
3420 } 3428 }
3421 3429
3422 std::unique_ptr<content::NavigationUIData> 3430 std::unique_ptr<content::NavigationUIData>
3423 ChromeContentBrowserClient::GetNavigationUIData( 3431 ChromeContentBrowserClient::GetNavigationUIData(
3424 content::NavigationHandle* navigation_handle) { 3432 content::NavigationHandle* navigation_handle) {
3425 return base::MakeUnique<ChromeNavigationUIData>(navigation_handle); 3433 return base::MakeUnique<ChromeNavigationUIData>(navigation_handle);
3426 } 3434 }
3427 3435
3428 content::DevToolsManagerDelegate* 3436 content::DevToolsManagerDelegate*
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
3553 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { 3561 RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
3554 return variations::GetVariationParamValue( 3562 return variations::GetVariationParamValue(
3555 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; 3563 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
3556 } 3564 }
3557 3565
3558 // static 3566 // static
3559 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( 3567 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
3560 const storage::QuotaSettings* settings) { 3568 const storage::QuotaSettings* settings) {
3561 g_default_quota_settings = settings; 3569 g_default_quota_settings = settings;
3562 } 3570 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698