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

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

Issue 2795053002: [subresource_filter] Implement the "Smart" UI on Android (Closed)
Patch Set: jkarlin review 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>
8
9 #include "base/metrics/histogram_macros.h" 7 #include "base/metrics/histogram_macros.h"
10 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
11 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
12 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 9 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
13 #include "chrome/browser/infobars/infobar_service.h" 10 #include "chrome/browser/infobars/infobar_service.h"
14 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/subresource_filter/subresource_filter_content_settings_ manager.h"
15 #include "chrome/browser/subresource_filter/subresource_filter_content_settings_ manager_factory.h" 13 #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" 14 #include "chrome/browser/ui/android/content_settings/subresource_filter_infobar_ delegate.h"
17 #include "components/content_settings/core/browser/host_content_settings_map.h"
18 #include "components/content_settings/core/common/content_settings_types.h"
19 #include "components/subresource_filter/content/browser/content_ruleset_service. h" 15 #include "components/subresource_filter/content/browser/content_ruleset_service. h"
16 #include "components/subresource_filter/core/common/activation_level.h"
17 #include "components/subresource_filter/core/common/activation_state.h"
20 18
21 ChromeSubresourceFilterClient::ChromeSubresourceFilterClient( 19 ChromeSubresourceFilterClient::ChromeSubresourceFilterClient(
22 content::WebContents* web_contents) 20 content::WebContents* web_contents)
23 : web_contents_(web_contents), shown_for_navigation_(false) { 21 : settings_manager_(
24 DCHECK(web_contents); 22 SubresourceFilterContentSettingsManagerFactory::EnsureForProfile(
25 // Ensure the content settings manager is initialized. 23 Profile::FromBrowserContext(web_contents->GetBrowserContext()))),
26 SubresourceFilterContentSettingsManagerFactory::EnsureForProfile( 24 web_contents_(web_contents),
27 Profile::FromBrowserContext(web_contents_->GetBrowserContext())); 25 shown_for_navigation_(false) {
26 DCHECK(settings_manager_);
28 } 27 }
29 28
30 ChromeSubresourceFilterClient::~ChromeSubresourceFilterClient() {} 29 ChromeSubresourceFilterClient::~ChromeSubresourceFilterClient() {}
31 30
32 void ChromeSubresourceFilterClient::ToggleNotificationVisibility( 31 void ChromeSubresourceFilterClient::ToggleNotificationVisibility(
33 bool visibility) { 32 bool visibility) {
34 if (shown_for_navigation_ && visibility) 33 if (shown_for_navigation_ && visibility)
35 return; 34 return;
36 35 shown_for_navigation_ = false;
37 shown_for_navigation_ = visibility;
38 TabSpecificContentSettings* content_settings =
39 TabSpecificContentSettings::FromWebContents(web_contents_);
40 36
41 // |visibility| is false when a new navigation starts. 37 // |visibility| is false when a new navigation starts.
42 if (visibility) { 38 if (visibility) {
43 content_settings->OnContentBlocked( 39 const GURL& top_level_url = web_contents_->GetLastCommittedURL();
44 CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER); 40 if (!settings_manager_->ShouldShowUIForSite(top_level_url)) {
45 LogAction(kActionUIShown); 41 LogAction(kActionUISuppressed);
42 return;
43 }
46 #if defined(OS_ANDROID) 44 #if defined(OS_ANDROID)
47 InfoBarService* infobar_service = 45 InfoBarService* infobar_service =
48 InfoBarService::FromWebContents(web_contents_); 46 InfoBarService::FromWebContents(web_contents_);
49 SubresourceFilterInfobarDelegate::Create(infobar_service); 47 SubresourceFilterInfobarDelegate::Create(infobar_service);
50 #endif 48 #endif
49 TabSpecificContentSettings* content_settings =
50 TabSpecificContentSettings::FromWebContents(web_contents_);
51 content_settings->OnContentBlocked(
52 CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER);
53
54 LogAction(kActionUIShown);
55 shown_for_navigation_ = true;
56 settings_manager_->OnDidShowUI(top_level_url);
51 } else { 57 } else {
52 LogAction(kActionNavigationStarted); 58 LogAction(kActionNavigationStarted);
53 } 59 }
54 } 60 }
55 61
56 bool ChromeSubresourceFilterClient::IsWhitelistedByContentSettings( 62 bool ChromeSubresourceFilterClient::IsWhitelistedByContentSettings(
57 const GURL& url) { 63 const GURL& top_level_url) {
58 return GetContentSettingForUrl(url) == CONTENT_SETTING_BLOCK; 64 return settings_manager_->GetContentSetting(top_level_url) ==
65 CONTENT_SETTING_BLOCK;
59 } 66 }
60 67
61 void ChromeSubresourceFilterClient::WhitelistByContentSettings( 68 void ChromeSubresourceFilterClient::WhitelistByContentSettings(
62 const GURL& url) { 69 const GURL& top_level_url) {
63 // Whitelist via content settings. 70 // Whitelist via content settings. SetContentSettings has logic to ignore
64 Profile* profile = 71 // metrics for these calls, so also log the generic blocked metrics.
65 Profile::FromBrowserContext(web_contents_->GetBrowserContext()); 72 settings_manager_->SetContentSetting(top_level_url, CONTENT_SETTING_BLOCK,
66 DCHECK(profile); 73 true /* from_ui */);
67 HostContentSettingsMap* settings_map = 74 }
68 HostContentSettingsMapFactory::GetForProfile(profile);
69 settings_map->SetContentSettingDefaultScope(
70 url, url, ContentSettingsType::CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER,
71 std::string(), CONTENT_SETTING_BLOCK);
72 75
73 LogAction(kActionContentSettingsBlockedFromUI); 76 void ChromeSubresourceFilterClient::OnActivationComputed(
77 const GURL& top_level_url,
78 const subresource_filter::ActivationState& state) {
79 // Clear the content setting when the site does not trigger activation.
80 if (state.activation_level != subresource_filter::ActivationLevel::ENABLED &&
81 settings_manager_->GetContentSetting(top_level_url) ==
82 CONTENT_SETTING_ALLOW) {
83 settings_manager_->ClearContentSetting(top_level_url);
84 }
74 } 85 }
75 86
76 // static 87 // static
77 void ChromeSubresourceFilterClient::LogAction(SubresourceFilterAction action) { 88 void ChromeSubresourceFilterClient::LogAction(SubresourceFilterAction action) {
78 UMA_HISTOGRAM_ENUMERATION("SubresourceFilter.Actions", action, 89 UMA_HISTOGRAM_ENUMERATION("SubresourceFilter.Actions", action,
79 kActionLastEntry); 90 kActionLastEntry);
80 } 91 }
81 92
82 ContentSetting ChromeSubresourceFilterClient::GetContentSettingForUrl(
83 const GURL& url) {
84 Profile* profile =
85 Profile::FromBrowserContext(web_contents_->GetBrowserContext());
86 DCHECK(profile);
87 HostContentSettingsMap* settings_map =
88 HostContentSettingsMapFactory::GetForProfile(profile);
89 return settings_map->GetContentSetting(
90 url, url, ContentSettingsType::CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER,
91 std::string());
92 }
93
94 subresource_filter::VerifiedRulesetDealer::Handle* 93 subresource_filter::VerifiedRulesetDealer::Handle*
95 ChromeSubresourceFilterClient::GetRulesetDealer() { 94 ChromeSubresourceFilterClient::GetRulesetDealer() {
96 subresource_filter::ContentRulesetService* ruleset_service = 95 subresource_filter::ContentRulesetService* ruleset_service =
97 g_browser_process->subresource_filter_ruleset_service(); 96 g_browser_process->subresource_filter_ruleset_service();
98 return ruleset_service ? ruleset_service->ruleset_dealer() : nullptr; 97 return ruleset_service ? ruleset_service->ruleset_dealer() : nullptr;
99 } 98 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698