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

Side by Side Diff: chrome/browser/subresource_filter/chrome_subresource_filter_client.cc

Issue 2850373002: Make ChromeSubresourceFilterClient a WebContentsUserData (Closed)
Patch Set: rebase Created 3 years, 7 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/subresource_filter/chrome_subresource_filter_client.h" 5 #include "chrome/browser/subresource_filter/chrome_subresource_filter_client.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/metrics/histogram_macros.h" 9 #include "base/metrics/histogram_macros.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
11 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" 11 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
12 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 12 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
13 #include "chrome/browser/infobars/infobar_service.h" 13 #include "chrome/browser/infobars/infobar_service.h"
14 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/subresource_filter/subresource_filter_profile_context_f actory.h" 15 #include "chrome/browser/subresource_filter/subresource_filter_profile_context_f actory.h"
16 #include "chrome/browser/ui/android/content_settings/subresource_filter_infobar_ delegate.h" 16 #include "chrome/browser/ui/android/content_settings/subresource_filter_infobar_ delegate.h"
17 #include "components/content_settings/core/browser/host_content_settings_map.h" 17 #include "components/content_settings/core/browser/host_content_settings_map.h"
18 #include "components/content_settings/core/common/content_settings_types.h" 18 #include "components/content_settings/core/common/content_settings_types.h"
19 #include "components/subresource_filter/content/browser/content_ruleset_service. h" 19 #include "components/subresource_filter/content/browser/content_ruleset_service. h"
20 #include "components/subresource_filter/content/browser/content_subresource_filt er_driver_factory.h"
20 #include "content/public/browser/navigation_handle.h" 21 #include "content/public/browser/navigation_handle.h"
21 22
23 DEFINE_WEB_CONTENTS_USER_DATA_KEY(ChromeSubresourceFilterClient);
24
22 ChromeSubresourceFilterClient::ChromeSubresourceFilterClient( 25 ChromeSubresourceFilterClient::ChromeSubresourceFilterClient(
23 content::WebContents* web_contents) 26 content::WebContents* web_contents)
24 : web_contents_(web_contents), did_show_ui_for_navigation_(false) { 27 : web_contents_(web_contents), did_show_ui_for_navigation_(false) {
25 DCHECK(web_contents); 28 DCHECK(web_contents);
26 SubresourceFilterProfileContextFactory::EnsureForProfile( 29 SubresourceFilterProfileContextFactory::EnsureForProfile(
27 Profile::FromBrowserContext(web_contents_->GetBrowserContext())); 30 Profile::FromBrowserContext(web_contents_->GetBrowserContext()));
31
32 subresource_filter::ContentSubresourceFilterDriverFactory::
33 CreateForWebContents(web_contents, this);
28 } 34 }
29 35
30 ChromeSubresourceFilterClient::~ChromeSubresourceFilterClient() {} 36 ChromeSubresourceFilterClient::~ChromeSubresourceFilterClient() {}
31 37
32 void ChromeSubresourceFilterClient::ToggleNotificationVisibility( 38 void ChromeSubresourceFilterClient::ToggleNotificationVisibility(
33 bool visibility) { 39 bool visibility) {
34 if (did_show_ui_for_navigation_ && visibility) 40 if (did_show_ui_for_navigation_ && visibility)
35 return; 41 return;
36 42
37 did_show_ui_for_navigation_ = visibility; 43 did_show_ui_for_navigation_ = visibility;
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 url, url, ContentSettingsType::CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER, 105 url, url, ContentSettingsType::CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER,
100 std::string()); 106 std::string());
101 } 107 }
102 108
103 subresource_filter::VerifiedRulesetDealer::Handle* 109 subresource_filter::VerifiedRulesetDealer::Handle*
104 ChromeSubresourceFilterClient::GetRulesetDealer() { 110 ChromeSubresourceFilterClient::GetRulesetDealer() {
105 subresource_filter::ContentRulesetService* ruleset_service = 111 subresource_filter::ContentRulesetService* ruleset_service =
106 g_browser_process->subresource_filter_ruleset_service(); 112 g_browser_process->subresource_filter_ruleset_service();
107 return ruleset_service ? ruleset_service->ruleset_dealer() : nullptr; 113 return ruleset_service ? ruleset_service->ruleset_dealer() : nullptr;
108 } 114 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698