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

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

Issue 2820933002: [subresource_filter] add //chrome level unit test harness (Closed)
Patch Set: remove dep Created 3 years, 8 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_content_settings_ manager_factory.h" 15 #include "chrome/browser/subresource_filter/subresource_filter_content_settings_ manager_factory.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 "content/public/browser/navigation_handle.h" 20 #include "content/public/browser/navigation_handle.h"
21 21
22 ChromeSubresourceFilterClient::ChromeSubresourceFilterClient( 22 ChromeSubresourceFilterClient::ChromeSubresourceFilterClient(
23 content::WebContents* web_contents) 23 content::WebContents* web_contents)
24 : web_contents_(web_contents), shown_for_navigation_(false) { 24 : web_contents_(web_contents), did_show_ui_for_navigation_(false) {
25 DCHECK(web_contents); 25 DCHECK(web_contents);
26 // Ensure the content settings manager is initialized. 26 // Ensure the content settings manager is initialized.
27 SubresourceFilterContentSettingsManagerFactory::EnsureForProfile( 27 SubresourceFilterContentSettingsManagerFactory::EnsureForProfile(
28 Profile::FromBrowserContext(web_contents_->GetBrowserContext())); 28 Profile::FromBrowserContext(web_contents_->GetBrowserContext()));
29 } 29 }
30 30
31 ChromeSubresourceFilterClient::~ChromeSubresourceFilterClient() {} 31 ChromeSubresourceFilterClient::~ChromeSubresourceFilterClient() {}
32 32
33 void ChromeSubresourceFilterClient::ToggleNotificationVisibility( 33 void ChromeSubresourceFilterClient::ToggleNotificationVisibility(
34 bool visibility) { 34 bool visibility) {
35 if (shown_for_navigation_ && visibility) 35 if (did_show_ui_for_navigation_ && visibility)
36 return; 36 return;
37 37
38 shown_for_navigation_ = visibility; 38 did_show_ui_for_navigation_ = visibility;
39 TabSpecificContentSettings* content_settings = 39 TabSpecificContentSettings* content_settings =
40 TabSpecificContentSettings::FromWebContents(web_contents_); 40 TabSpecificContentSettings::FromWebContents(web_contents_);
41 41
42 // |visibility| is false when a new navigation starts. 42 // |visibility| is false when a new navigation starts.
43 if (visibility) { 43 if (visibility) {
44 content_settings->OnContentBlocked( 44 content_settings->OnContentBlocked(
45 CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER); 45 CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER);
46 LogAction(kActionUIShown); 46 LogAction(kActionUIShown);
47 #if defined(OS_ANDROID) 47 #if defined(OS_ANDROID)
48 InfoBarService* infobar_service = 48 InfoBarService* infobar_service =
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 url, url, ContentSettingsType::CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER, 100 url, url, ContentSettingsType::CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER,
101 std::string()); 101 std::string());
102 } 102 }
103 103
104 subresource_filter::VerifiedRulesetDealer::Handle* 104 subresource_filter::VerifiedRulesetDealer::Handle*
105 ChromeSubresourceFilterClient::GetRulesetDealer() { 105 ChromeSubresourceFilterClient::GetRulesetDealer() {
106 subresource_filter::ContentRulesetService* ruleset_service = 106 subresource_filter::ContentRulesetService* ruleset_service =
107 g_browser_process->subresource_filter_ruleset_service(); 107 g_browser_process->subresource_filter_ruleset_service();
108 return ruleset_service ? ruleset_service->ruleset_dealer() : nullptr; 108 return ruleset_service ? ruleset_service->ruleset_dealer() : nullptr;
109 } 109 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698