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

Unified Diff: chrome/browser/subresource_filter/chrome_subresource_filter_client.cc

Issue 2762403002: Wire up the ThrottleManager using the existing page activation logic (Closed)
Patch Set: pkalinnikov review 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
diff --git a/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc b/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
index 43b8eb5776dedf75084cfbcb99045e15b49d8f39..e6e874770b73b2468b8121713174ea4146d9e4e6 100644
--- a/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
+++ b/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
@@ -7,6 +7,7 @@
#include <string>
#include "base/metrics/histogram_macros.h"
+#include "chrome/browser/browser_process.h"
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
#include "chrome/browser/content_settings/tab_specific_content_settings.h"
#include "chrome/browser/infobars/infobar_service.h"
@@ -15,6 +16,8 @@
#include "chrome/browser/ui/android/content_settings/subresource_filter_infobar_delegate.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
#include "components/content_settings/core/common/content_settings_types.h"
+#include "components/subresource_filter/content/browser/content_ruleset_service.h"
+#include "components/subresource_filter/content/browser/verified_ruleset_dealer.h"
engedy 2017/04/04 11:36:52 nit: I think we don't need the complete type here.
pkalinnikov 2017/04/04 11:43:40 We do need the header, because the Handle is an in
engedy 2017/04/04 12:03:23 My point is that we are not using anything more he
pkalinnikov 2017/04/04 12:05:27 Ah, got it. Agree with this point.
Charlie Harrison 2017/04/04 15:54:00 Done.
ChromeSubresourceFilterClient::ChromeSubresourceFilterClient(
content::WebContents* web_contents)
@@ -88,3 +91,10 @@ ContentSetting ChromeSubresourceFilterClient::GetContentSettingForUrl(
url, url, ContentSettingsType::CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER,
std::string());
}
+
+subresource_filter::VerifiedRulesetDealer::Handle*
+ChromeSubresourceFilterClient::GetRulesetDealer() {
+ subresource_filter::ContentRulesetService* ruleset_service =
+ g_browser_process->subresource_filter_ruleset_service();
+ return ruleset_service ? ruleset_service->ruleset_dealer() : nullptr;
+}

Powered by Google App Engine
This is Rietveld 408576698