The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/cf2dce6a6dcb889081057acdd10448448813bdda

commit cf2dce6a6dcb889081057acdd10448448813bdda
Author: melandory <melandory@chromium.org>
Date: Wed Feb 08 12:58:22 2017

Adds the setting to limit the subresource filter activation.

BUG= 689487 

Review-Url: https://codereview.chromium.org/2680283002
Cr-Commit-Position: refs/heads/master@{#448969}

[modify] https://crrev.com/cf2dce6a6dcb889081057acdd10448448813bdda/components/content_settings/core/browser/content_settings_registry.cc
[modify] https://crrev.com/cf2dce6a6dcb889081057acdd10448448813bdda/components/content_settings/core/common/content_settings.cc
[modify] https://crrev.com/cf2dce6a6dcb889081057acdd10448448813bdda/components/content_settings/core/common/content_settings_types.h

melandory: could you please explain exactly what the new setting will control? What does ALLOW mean and what does BLOCK mean for a site? Thanks!

raymes@: currently, I can't add any meaningful comment in the public repo. Once it will be possible we'll add proper explanation.

melandory: Could you add details here then? As someone who shares responsibility for code you are touching I feel like it's important to understand what exactly this will be doing. 

Just as heads up to someone who will continue working on this, email with explanation why this settings is needed was sent to raymes.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/7be36d31cf92f725808f0260e565ed093541505f

commit 7be36d31cf92f725808f0260e565ed093541505f
Author: melandory <melandory@chromium.org>
Date: Wed Mar 29 15:51:12 2017

Add desktop UI for the subresource filter content setting.

Added option on chrome://settings/content to toggle subresource filter on a
global or per-site basis.

BUG= 689487 ,  689992 
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2682293002
Cr-Commit-Position: refs/heads/master@{#460402}

[modify] https://crrev.com/7be36d31cf92f725808f0260e565ed093541505f/chrome/app/generated_resources.grd
[add] https://crrev.com/7be36d31cf92f725808f0260e565ed093541505f/chrome/app/theme/default_100_percent/common/allowed_subresource_filter.png
[add] https://crrev.com/7be36d31cf92f725808f0260e565ed093541505f/chrome/app/theme/default_100_percent/common/blocked_subresource_filter.png
[add] https://crrev.com/7be36d31cf92f725808f0260e565ed093541505f/chrome/app/theme/default_200_percent/common/allowed_subresource_filter.png
[add] https://crrev.com/7be36d31cf92f725808f0260e565ed093541505f/chrome/app/theme/default_200_percent/common/blocked_subresource_filter.png
[modify] https://crrev.com/7be36d31cf92f725808f0260e565ed093541505f/chrome/app/theme/theme_resources.grd
[modify] https://crrev.com/7be36d31cf92f725808f0260e565ed093541505f/chrome/browser/resources/settings/privacy_page/privacy_page.html
[modify] https://crrev.com/7be36d31cf92f725808f0260e565ed093541505f/chrome/browser/resources/settings/privacy_page/privacy_page.js
[modify] https://crrev.com/7be36d31cf92f725808f0260e565ed093541505f/chrome/browser/resources/settings/route.js
[modify] https://crrev.com/7be36d31cf92f725808f0260e565ed093541505f/chrome/browser/resources/settings/site_settings/category_default_setting.js
[modify] https://crrev.com/7be36d31cf92f725808f0260e565ed093541505f/chrome/browser/resources/settings/site_settings/constants.js
[modify] https://crrev.com/7be36d31cf92f725808f0260e565ed093541505f/chrome/browser/resources/settings/site_settings_page/site_settings_page.html
[modify] https://crrev.com/7be36d31cf92f725808f0260e565ed093541505f/chrome/browser/resources/settings/site_settings_page/site_settings_page.js
[modify] https://crrev.com/7be36d31cf92f725808f0260e565ed093541505f/chrome/browser/ui/BUILD.gn
[modify] https://crrev.com/7be36d31cf92f725808f0260e565ed093541505f/chrome/browser/ui/chrome_pages.cc
[modify] https://crrev.com/7be36d31cf92f725808f0260e565ed093541505f/chrome/browser/ui/page_info/page_info.cc
[modify] https://crrev.com/7be36d31cf92f725808f0260e565ed093541505f/chrome/browser/ui/page_info/page_info_ui.cc
[modify] https://crrev.com/7be36d31cf92f725808f0260e565ed093541505f/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
[modify] https://crrev.com/7be36d31cf92f725808f0260e565ed093541505f/chrome/browser/ui/webui/site_settings_helper.cc
[modify] https://crrev.com/7be36d31cf92f725808f0260e565ed093541505f/chrome/test/data/webui/settings/site_list_tests.js
[modify] https://crrev.com/7be36d31cf92f725808f0260e565ed093541505f/chrome/test/data/webui/settings/test_site_settings_prefs_browser_proxy.js

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/459465b1d6d569a612b16526a30af878a8df1b10

commit 459465b1d6d569a612b16526a30af878a8df1b10
Author: csharrison <csharrison@chromium.org>
Date: Thu Mar 30 14:08:29 2017

[subresource_filter] Add domains to content settings whitelist

BUG= 689487 

Review-Url: https://codereview.chromium.org/2772393002
Cr-Commit-Position: refs/heads/master@{#460748}

[modify] https://crrev.com/459465b1d6d569a612b16526a30af878a8df1b10/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
[modify] https://crrev.com/459465b1d6d569a612b16526a30af878a8df1b10/chrome/browser/subresource_filter/chrome_subresource_filter_client.h
[modify] https://crrev.com/459465b1d6d569a612b16526a30af878a8df1b10/chrome/browser/subresource_filter/subresource_filter_browsertest.cc
[modify] https://crrev.com/459465b1d6d569a612b16526a30af878a8df1b10/components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc
[modify] https://crrev.com/459465b1d6d569a612b16526a30af878a8df1b10/components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h
[modify] https://crrev.com/459465b1d6d569a612b16526a30af878a8df1b10/components/subresource_filter/content/browser/content_subresource_filter_driver_factory_unittest.cc
[modify] https://crrev.com/459465b1d6d569a612b16526a30af878a8df1b10/components/subresource_filter/content/browser/subresource_filter_client.h

Screenshots of the initial Content Setting UI for Android 

Deleted: site_settings_menu.png 37.1 KB

	site_settings_menu.png 37.1 KB View Download

Deleted: site_settings_category.png 26.0 KB

	site_settings_category.png 26.0 KB View Download

Deleted: single_site_settings.png 25.7 KB

	single_site_settings.png 25.7 KB View Download

finnur: The above mocks are just the current implementation, you are correct. Please see go/subresource-filter-ui-explanation for links to the end-state mocks.

We're still working on finalizing strings, and we can't publish anything in the public repo until we've made a public announcement. Since we're hoping to ship soon after the announcement is made we're hoping to get most of the engineering work out of the way using placeholder strings + icons.

Does this make sense?

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/3f46d56fe6658eb13d6b96b31fab2233b43d856f

commit 3f46d56fe6658eb13d6b96b31fab2233b43d856f
Author: csharrison <csharrison@chromium.org>
Date: Wed Apr 05 18:19:34 2017

[subresource_filter] Add the Content Settings UI for Android

BUG= 689487 

Review-Url: https://codereview.chromium.org/2785913002
Cr-Commit-Position: refs/heads/master@{#462151}

[modify] https://crrev.com/3f46d56fe6658eb13d6b96b31fab2233b43d856f/chrome/android/java/res/xml/single_website_preferences.xml
[modify] https://crrev.com/3f46d56fe6658eb13d6b96b31fab2233b43d856f/chrome/android/java/res/xml/site_settings_preferences.xml
[modify] https://crrev.com/3f46d56fe6658eb13d6b96b31fab2233b43d856f/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
[modify] https://crrev.com/3f46d56fe6658eb13d6b96b31fab2233b43d856f/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java
[modify] https://crrev.com/3f46d56fe6658eb13d6b96b31fab2233b43d856f/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
[modify] https://crrev.com/3f46d56fe6658eb13d6b96b31fab2233b43d856f/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java
[modify] https://crrev.com/3f46d56fe6658eb13d6b96b31fab2233b43d856f/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsCategory.java
[modify] https://crrev.com/3f46d56fe6658eb13d6b96b31fab2233b43d856f/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
[modify] https://crrev.com/3f46d56fe6658eb13d6b96b31fab2233b43d856f/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java
[modify] https://crrev.com/3f46d56fe6658eb13d6b96b31fab2233b43d856f/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java
[modify] https://crrev.com/3f46d56fe6658eb13d6b96b31fab2233b43d856f/chrome/android/java/strings/android_chrome_strings.grd
[modify] https://crrev.com/3f46d56fe6658eb13d6b96b31fab2233b43d856f/chrome/browser/android/chrome_feature_list.cc
[modify] https://crrev.com/3f46d56fe6658eb13d6b96b31fab2233b43d856f/chrome/browser/android/preferences/pref_service_bridge.cc
[modify] https://crrev.com/3f46d56fe6658eb13d6b96b31fab2233b43d856f/chrome/browser/ui/android/page_info/page_info_popup_android.cc

I'm not on the Enamel team anymore. +some peeps who are. :)

raymes, could you take a look on Comment 14?

For the ordering of the setting, I would say somewhere down the bottom but I don't feel too strongly. emilyschechter or UX folks may have more input.

I don't feel strongly about it either, but would really appreciate if we could make a decision (any) and keep the doc up to date.

Material describing permissions ordering:
https://bugs.chromium.org/p/chromium/issues/detail?id=610358c
https://docs.google.com/spreadsheets/d/1bVRBeEcJ3YSJNMKq9U9pm-dGFtVRDryzfojoDeYpirI/edit#gid=0

I'd suggest putting this right below Popup Blocking as they seem related concepts to me.

Thanks Emily, I can apply that order in the code.
Would you like me to update the docs?

Sure, that would be great. Thanks!

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/94ad9a25b35bb0bb2fbb488c40239f5ece40b277

commit 94ad9a25b35bb0bb2fbb488c40239f5ece40b277
Author: csharrison <csharrison@chromium.org>
Date: Tue Apr 11 19:46:43 2017

Reorder the Subresource filter setting to be under popups

BUG= 689487 
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2806203004
Cr-Commit-Position: refs/heads/master@{#463731}

[modify] https://crrev.com/94ad9a25b35bb0bb2fbb488c40239f5ece40b277/chrome/android/java/res/xml/single_website_preferences.xml
[modify] https://crrev.com/94ad9a25b35bb0bb2fbb488c40239f5ece40b277/chrome/android/java/res/xml/site_settings_preferences.xml
[modify] https://crrev.com/94ad9a25b35bb0bb2fbb488c40239f5ece40b277/chrome/browser/resources/settings/site_settings_page/site_settings_page.html

Uh, last I heard we weren't going to expose this to users. Do we expect them to know what a "Subresource filter" is?

(My first guess as a savvy user would be that it's an ad blocker.)

What's the reason for calling it "subresource filter" internally, then?

There are a lot of things in Chrome that filter subresources already, and I'm concerned about clarity of related code without context. :-/

Yeah, it is kind of confusing. The name was chosen a while ago as the name of the component (in src/components/subresource_filter), but we've only recently started surfacing it in placeholder strings in e.g. content settings.

Hopefully this will be resolved relatively soon when the feature is announced, but if you feel that the placeholder strings are too confusing I can try to come up with something else.

Taking back ownership

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/19811b689efb15501224d8c8151abe0bbc8392a6

commit 19811b689efb15501224d8c8151abe0bbc8392a6
Author: csharrison <csharrison@chromium.org>
Date: Thu May 11 00:47:37 2017

[subresource_filter] Refactor activation suppression

Right now, we query for activation suppression in two places
1. Computing ActivationDecision in the driver_factory
2. Right before sending the Activation IPC in the throttle_manager

Since (1) fully controls notifying page activation to the
throttle_manager, (2) is completely unnecessary. This CL removes that
functionality from the throttle manager delegate.

BUG= 689487 

Review-Url: https://codereview.chromium.org/2871013002
Cr-Commit-Position: refs/heads/master@{#470765}

[modify] https://crrev.com/19811b689efb15501224d8c8151abe0bbc8392a6/components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc
[modify] https://crrev.com/19811b689efb15501224d8c8151abe0bbc8392a6/components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h
[modify] https://crrev.com/19811b689efb15501224d8c8151abe0bbc8392a6/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
[modify] https://crrev.com/19811b689efb15501224d8c8151abe0bbc8392a6/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h
[modify] https://crrev.com/19811b689efb15501224d8c8151abe0bbc8392a6/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager_unittest.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/61d9b5150be41b4e7e5390a5c1e242f90709539a

commit 61d9b5150be41b4e7e5390a5c1e242f90709539a
Author: csharrison <csharrison@chromium.org>
Date: Thu May 11 09:19:48 2017

[subresource_filter] s/ShouldSuppressActivation/OnPageActivationComputed

This patch slightly refactors the SubresourceFilterClient::ShouldSuppressActivation
to be the very last check in activation computation, as well renaming it to
OnPageActivationComputed (which takes an extra |activated| bool).

This will be used as an accurate //chrome level signal for when activation is disabled
for a given site.

BUG= 689487 

Review-Url: https://codereview.chromium.org/2874663002
Cr-Commit-Position: refs/heads/master@{#470885}

[modify] https://crrev.com/61d9b5150be41b4e7e5390a5c1e242f90709539a/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
[modify] https://crrev.com/61d9b5150be41b4e7e5390a5c1e242f90709539a/chrome/browser/subresource_filter/chrome_subresource_filter_client.h
[modify] https://crrev.com/61d9b5150be41b4e7e5390a5c1e242f90709539a/components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc
[modify] https://crrev.com/61d9b5150be41b4e7e5390a5c1e242f90709539a/components/subresource_filter/content/browser/content_subresource_filter_driver_factory_unittest.cc
[modify] https://crrev.com/61d9b5150be41b4e7e5390a5c1e242f90709539a/components/subresource_filter/content/browser/subresource_filter_client.h
[modify] https://crrev.com/61d9b5150be41b4e7e5390a5c1e242f90709539a/components/subresource_filter/content/browser/subresource_filter_safe_browsing_activation_throttle_unittest.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/31a9f6426ec06155f4b95e5e125d76e0371d0c74

commit 31a9f6426ec06155f4b95e5e125d76e0371d0c74
Author: csharrison <csharrison@chromium.org>
Date: Thu May 11 14:22:42 2017

[subresource_filter] Make website setting existence imply site activation

This patch tries its best to make the relationship 1:1 between site activation
status and the WebsiteSetting metadata being present for that origin.

The setting is added when a site is activated and the UI is shown (to prevent cases
where no resources are filtered or we are activated but suppressing UI).

The setting is removed when a site is found to not activate for a particular top level
navigation (% content setting whitelists), or when a url matching the setting's origin
is deleted from history. Since we don't want to clear this state if the user makes
some explicit action (like whitelisting), we make sure the whitelisting check is the
very last one in activation computation and don't take it into account for setting
removal.

In this way the setting is a best approximation for a cached activation state (minus
content setting policy) for a given origin. Currently it is only used for the smart UI,
but in follow up patches we will make other settings UI surfaces dependent on this
 state.

Note: The setting is now used on both Desktop and Android, and is now NOT_LOSSY.

BUG= 689487 

Review-Url: https://codereview.chromium.org/2859783002
Cr-Commit-Position: refs/heads/master@{#470945}

[modify] https://crrev.com/31a9f6426ec06155f4b95e5e125d76e0371d0c74/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
[modify] https://crrev.com/31a9f6426ec06155f4b95e5e125d76e0371d0c74/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.cc
[modify] https://crrev.com/31a9f6426ec06155f4b95e5e125d76e0371d0c74/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.h
[modify] https://crrev.com/31a9f6426ec06155f4b95e5e125d76e0371d0c74/chrome/browser/subresource_filter/subresource_filter_unittest.cc
[modify] https://crrev.com/31a9f6426ec06155f4b95e5e125d76e0371d0c74/components/content_settings/core/browser/website_settings_registry.cc
[modify] https://crrev.com/31a9f6426ec06155f4b95e5e125d76e0371d0c74/components/content_settings/core/common/content_settings_types.h
[modify] https://crrev.com/31a9f6426ec06155f4b95e5e125d76e0371d0c74/components/subresource_filter/content/browser/fake_safe_browsing_database_manager.cc
[modify] https://crrev.com/31a9f6426ec06155f4b95e5e125d76e0371d0c74/components/subresource_filter/content/browser/fake_safe_browsing_database_manager.h

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/31a9f6426ec06155f4b95e5e125d76e0371d0c74

commit 31a9f6426ec06155f4b95e5e125d76e0371d0c74
Author: csharrison <csharrison@chromium.org>
Date: Thu May 11 14:22:42 2017

[subresource_filter] Make website setting existence imply site activation

This patch tries its best to make the relationship 1:1 between site activation
status and the WebsiteSetting metadata being present for that origin.

The setting is added when a site is activated and the UI is shown (to prevent cases
where no resources are filtered or we are activated but suppressing UI).

The setting is removed when a site is found to not activate for a particular top level
navigation (% content setting whitelists), or when a url matching the setting's origin
is deleted from history. Since we don't want to clear this state if the user makes
some explicit action (like whitelisting), we make sure the whitelisting check is the
very last one in activation computation and don't take it into account for setting
removal.

In this way the setting is a best approximation for a cached activation state (minus
content setting policy) for a given origin. Currently it is only used for the smart UI,
but in follow up patches we will make other settings UI surfaces dependent on this
 state.

Note: The setting is now used on both Desktop and Android, and is now NOT_LOSSY.

BUG= 689487 

Review-Url: https://codereview.chromium.org/2859783002
Cr-Commit-Position: refs/heads/master@{#470945}

[modify] https://crrev.com/31a9f6426ec06155f4b95e5e125d76e0371d0c74/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
[modify] https://crrev.com/31a9f6426ec06155f4b95e5e125d76e0371d0c74/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.cc
[modify] https://crrev.com/31a9f6426ec06155f4b95e5e125d76e0371d0c74/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.h
[modify] https://crrev.com/31a9f6426ec06155f4b95e5e125d76e0371d0c74/chrome/browser/subresource_filter/subresource_filter_unittest.cc
[modify] https://crrev.com/31a9f6426ec06155f4b95e5e125d76e0371d0c74/components/content_settings/core/browser/website_settings_registry.cc
[modify] https://crrev.com/31a9f6426ec06155f4b95e5e125d76e0371d0c74/components/content_settings/core/common/content_settings_types.h
[modify] https://crrev.com/31a9f6426ec06155f4b95e5e125d76e0371d0c74/components/subresource_filter/content/browser/fake_safe_browsing_database_manager.cc
[modify] https://crrev.com/31a9f6426ec06155f4b95e5e125d76e0371d0c74/components/subresource_filter/content/browser/fake_safe_browsing_database_manager.h

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/ad1eaa6c4fd1c53f6e4be4da087a8c13a1e84058

commit ad1eaa6c4fd1c53f6e4be4da087a8c13a1e84058
Author: csharrison <csharrison@chromium.org>
Date: Thu May 11 17:14:38 2017

[subresource_filter] Gate Page Info on activation (i.e. website setting)

This setting should only show up if there is cached site activation,
which is determined via querying the associated website setting.

BUG= 689487 

Review-Url: https://codereview.chromium.org/2873313002
Cr-Commit-Position: refs/heads/master@{#470988}

[modify] https://crrev.com/ad1eaa6c4fd1c53f6e4be4da087a8c13a1e84058/chrome/browser/ui/page_info/page_info.cc
[modify] https://crrev.com/ad1eaa6c4fd1c53f6e4be4da087a8c13a1e84058/chrome/browser/ui/page_info/page_info_unittest.cc

Prototype of the Page Info subtitle with a placeholder string.

Deleted: subtitle.png 48.6 KB

	subtitle.png 48.6 KB View Download

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/cececce4d88ac1ca8b7a6e9f31597776ea151015

commit cececce4d88ac1ca8b7a6e9f31597776ea151015
Author: csharrison <csharrison@chromium.org>
Date: Fri May 12 16:51:21 2017

[subresource_filter] Add a subtitle for Android Page Info

This just uses a placeholder string for now.

BUG= 689487 

Review-Url: https://codereview.chromium.org/2879733002
Cr-Commit-Position: refs/heads/master@{#471339}

[modify] https://crrev.com/cececce4d88ac1ca8b7a6e9f31597776ea151015/chrome/android/java/res/layout/page_info_permission_row.xml
[modify] https://crrev.com/cececce4d88ac1ca8b7a6e9f31597776ea151015/chrome/android/java/src/org/chromium/chrome/browser/page_info/PageInfoPopup.java

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/3e994584017266c058161d4bd8856816191aeae5

commit 3e994584017266c058161d4bd8856816191aeae5
Author: csharrison <csharrison@chromium.org>
Date: Sun May 14 01:07:03 2017

[subresource_filter] Add ContentSettings.{Exceptions,Default} metrics

BUG= 689487 

Review-Url: https://codereview.chromium.org/2875133002
Cr-Commit-Position: refs/heads/master@{#471612}

[modify] https://crrev.com/3e994584017266c058161d4bd8856816191aeae5/chrome/browser/subresource_filter/subresource_filter_content_settings_manager_unittest.cc
[modify] https://crrev.com/3e994584017266c058161d4bd8856816191aeae5/components/content_settings/core/browser/content_settings_default_provider.cc
[modify] https://crrev.com/3e994584017266c058161d4bd8856816191aeae5/tools/metrics/histograms/histograms.xml

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/b5be4e3d0ac15fb087cf1cb63d29d3584ab8a6e9

commit b5be4e3d0ac15fb087cf1cb63d29d3584ab8a6e9
Author: csharrison <csharrison@chromium.org>
Date: Mon May 15 19:05:01 2017

MD Settings: make Subresource Filter exceptions a read-only-list

BUG= 689487 
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2875853002
Cr-Commit-Position: refs/heads/master@{#471854}

[modify] https://crrev.com/b5be4e3d0ac15fb087cf1cb63d29d3584ab8a6e9/chrome/browser/resources/settings/privacy_page/privacy_page.html
[modify] https://crrev.com/b5be4e3d0ac15fb087cf1cb63d29d3584ab8a6e9/chrome/browser/subresource_filter/chrome_subresource_filter_client.h
[modify] https://crrev.com/b5be4e3d0ac15fb087cf1cb63d29d3584ab8a6e9/tools/metrics/histograms/enums.xml

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/d7c4b64db12ae0c5e19593df15cc64fd0817bc64

commit d7c4b64db12ae0c5e19593df15cc64fd0817bc64
Author: csharrison <csharrison@chromium.org>
Date: Mon May 15 21:36:14 2017

[subresource_filter] Swap Allowed/Block groups in Site Settings

Subresource filter requires that the Allow group comes first.

BUG= 689487 

Review-Url: https://codereview.chromium.org/2882003003
Cr-Commit-Position: refs/heads/master@{#471910}

[modify] https://crrev.com/d7c4b64db12ae0c5e19593df15cc64fd0817bc64/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/d516a06227530ca47ccf5f872b334326e0137221

commit d516a06227530ca47ccf5f872b334326e0137221
Author: csharrison <csharrison@chromium.org>
Date: Tue May 16 01:05:24 2017

[subresource_filter] Always display the default setting in Android Page Info

This patch also slightly reorders the setting to align with the ordering
defined in  crbug.com/610358 

BUG= 689487 

Review-Url: https://codereview.chromium.org/2874073002
Cr-Commit-Position: refs/heads/master@{#471963}

[modify] https://crrev.com/d516a06227530ca47ccf5f872b334326e0137221/chrome/browser/ui/android/page_info/page_info_popup_android.cc
[modify] https://crrev.com/d516a06227530ca47ccf5f872b334326e0137221/chrome/browser/ui/android/page_info/page_info_popup_android.h

Screenshot of the new site details UI with the top header extra info. Combined with location header for maximum clarity.

Deleted: subresource_filter_with_location.png 41.1 KB

	subresource_filter_with_location.png 41.1 KB View Download

May I ask why we're adding custom sections at the top rather than showing them in the permission section?

The disjoint sections imply me that we're trying to describe different tings to the user, when we should really just be able to explain it once, well.

Hey lgarron, please see the discussion on the doc here (internal link):
https://docs.google.com/a/google.com/document/d/1yq9LjeHQRbSRMpRk70enuHOLqOvI3smwiO2mDs2irWI/edit?disco=AAAABMGlm5I

The previous proposal involved the dialog text and the selected subtitle text of the permission being different, which was implemented here:
https://codereview.chromium.org/2880953003/

lgarron: 100% agree with you. It's just that this is the UI we are currently using for things like that (see the location bar). We don't have the facility to show explanatory text right now in site details and we've never had mocks for it. We should do that, but it felt bad to conflate it with launching this feature.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/3f1f032e64562f3c6212fcd5cef20959812dcf40

commit 3f1f032e64562f3c6212fcd5cef20959812dcf40
Author: csharrison <csharrison@chromium.org>
Date: Wed May 17 15:20:26 2017

[subresource_filter] Swap ALLOW and BLOCK meanings in the content setting

This is to align the enum names with what the feature is doing rather
than whether the subresource_filter feature is enabled or not.

BUG= 689487 

Review-Url: https://codereview.chromium.org/2877553002
Cr-Commit-Position: refs/heads/master@{#472459}

[modify] https://crrev.com/3f1f032e64562f3c6212fcd5cef20959812dcf40/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
[modify] https://crrev.com/3f1f032e64562f3c6212fcd5cef20959812dcf40/chrome/browser/subresource_filter/chrome_subresource_filter_client.h
[modify] https://crrev.com/3f1f032e64562f3c6212fcd5cef20959812dcf40/chrome/browser/subresource_filter/subresource_filter_browsertest.cc
[modify] https://crrev.com/3f1f032e64562f3c6212fcd5cef20959812dcf40/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.cc
[modify] https://crrev.com/3f1f032e64562f3c6212fcd5cef20959812dcf40/chrome/browser/subresource_filter/subresource_filter_content_settings_manager_unittest.cc
[modify] https://crrev.com/3f1f032e64562f3c6212fcd5cef20959812dcf40/components/content_settings/core/browser/content_settings_registry.cc
[modify] https://crrev.com/3f1f032e64562f3c6212fcd5cef20959812dcf40/tools/metrics/histograms/enums.xml

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/e2aed4aa8b104427ef7568065d19606d8e0dc16e

commit e2aed4aa8b104427ef7568065d19606d8e0dc16e
Author: csharrison <csharrison@chromium.org>
Date: Mon May 22 21:35:15 2017

[subresource_filter] Add custom strings/behavior on Desktop Page Info

This CL adds the following to the OIB (Page Info):
 - The menu only has two items (no default), with custom strings
 - The selected text uses user managed strings instead of default string
   (e.g. "Block" instead of "Block (default)"

BUG= 689487 

Review-Url: https://codereview.chromium.org/2884813003
Cr-Commit-Position: refs/heads/master@{#473704}

[modify] https://crrev.com/e2aed4aa8b104427ef7568065d19606d8e0dc16e/chrome/browser/ui/page_info/page_info_ui.cc
[modify] https://crrev.com/e2aed4aa8b104427ef7568065d19606d8e0dc16e/chrome/browser/ui/page_info/permission_menu_model.cc
[modify] https://crrev.com/e2aed4aa8b104427ef7568065d19606d8e0dc16e/chrome/browser/ui/page_info/permission_menu_model_unittest.cc
[modify] https://crrev.com/e2aed4aa8b104427ef7568065d19606d8e0dc16e/components/page_info_strings.grdp

Unrestricting, but I had to redact a few comments mentioning internal names. LMK if something needs more explaining.

More screenshots as I'm landing real strings:

Deleted: ads_setting_blocked.png 37.3 KB

	ads_setting_blocked.png 37.3 KB View Download

Deleted: oib_ads_block.png 96.7 KB

	oib_ads_block.png 96.7 KB View Download

Deleted: oib_ads_allow_choice.png 103 KB

	oib_ads_allow_choice.png 103 KB View Download

Deleted: ads_setting_block_mobile.png 33.5 KB

	ads_setting_block_mobile.png 33.5 KB View Download

Deleted: page_info_ads_blocked.png 70.3 KB

	page_info_ads_blocked.png 70.3 KB View Download

Deleted: page_info_ads_allowed.png 70.4 KB

	page_info_ads_allowed.png 70.4 KB View Download

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/9f6c7fe99a9bd92bce38ebc9c629c89ccacd07eb

commit 9f6c7fe99a9bd92bce38ebc9c629c89ccacd07eb
Author: csharrison <csharrison@chromium.org>
Date: Wed Jun 07 16:24:25 2017

[subresource_filter] Site Details UI for default state

This patch changes the subresource filter Site Details page to show up
even if the setting is in the default state. Additionally it shows a
custom block string (a placeholder for now).

BUG= 689487 

Review-Url: https://codereview.chromium.org/2888473003
Cr-Commit-Position: refs/heads/master@{#477673}

[modify] https://crrev.com/9f6c7fe99a9bd92bce38ebc9c629c89ccacd07eb/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java
[modify] https://crrev.com/9f6c7fe99a9bd92bce38ebc9c629c89ccacd07eb/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java
[modify] https://crrev.com/9f6c7fe99a9bd92bce38ebc9c629c89ccacd07eb/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferenceBridge.java
[modify] https://crrev.com/9f6c7fe99a9bd92bce38ebc9c629c89ccacd07eb/chrome/android/java/strings/android_chrome_strings.grd
[modify] https://crrev.com/9f6c7fe99a9bd92bce38ebc9c629c89ccacd07eb/chrome/browser/android/preferences/website_preference_bridge.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f

commit a43e5aae4fc51f79d67fdcd8ccf81347c378d35f
Author: Charles Harrison <csharrison@chromium.org>
Date: Tue Jun 13 00:20:26 2017

[subresource_filter] First round of strings / UI elements for initial launch

These strings are mostly specific to the content setting UI. To make things
less confusing this CL also changes names and identifiers in UI code as
much as possible to refer to the "ads" permission instead of the subresource
filter permission.

Bug:  689487 
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I4674086763af5ab4e26fce748d9043a29e49e03d
Reviewed-on: https://chromium-review.googlesource.com/523783
Commit-Queue: Charlie Harrison <csharrison@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: Lucas Garron <lgarron@chromium.org>
Reviewed-by: Finnur Thorarinsson <finnur@chromium.org>
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Reviewed-by: Shivani Sharma <shivanisha@chromium.org>
Reviewed-by: Tommy Li <tommycli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#478839}
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/android/java/res/xml/single_website_preferences.xml
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/android/java/res/xml/site_settings_preferences.xml
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/android/java/src/org/chromium/chrome/browser/page_info/PageInfoPopup.java
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsCategory.java
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferenceBridge.java
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/android/java/strings/android_chrome_strings.grd
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/app/generated_resources.grd
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/app/settings_strings.grdp
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/browser/android/preferences/website_preference_bridge.cc
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/browser/resources/settings/privacy_page/privacy_page.html
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/browser/resources/settings/route.js
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/browser/resources/settings/site_settings/category_default_setting.js
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/browser/resources/settings/site_settings/constants.js
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/browser/resources/settings/site_settings_page/site_settings_page.html
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/browser/resources/settings/site_settings_page/site_settings_page.js
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/browser/ui/chrome_pages.cc
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/browser/ui/page_info/page_info_ui.cc
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/browser/ui/page_info/permission_menu_model.cc
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/browser/ui/webui/site_settings_helper.cc
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/test/data/webui/settings/all_sites_tests.js
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/test/data/webui/settings/site_list_tests.js
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/chrome/test/data/webui/settings/test_site_settings_prefs_browser_proxy.js
[modify] https://crrev.com/a43e5aae4fc51f79d67fdcd8ccf81347c378d35f/components/page_info_strings.grdp

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/305d75ac425d66c5c05fe25873af3f28d1bd148f

commit 305d75ac425d66c5c05fe25873af3f28d1bd148f
Author: Charles Harrison <csharrison@chromium.org>
Date: Fri Jun 16 22:05:17 2017

[subresource_filter] Only set metadata when the experimental UI is turned on

This patch also DCHECKs that we only whitelist via content settings
if the experimental UI is on.

Bug:  689487 
Change-Id: I520ee01b1b232e2ec40cfe6721b10a8cb922f5d3
Reviewed-on: https://chromium-review.googlesource.com/538273
Commit-Queue: Charlie Harrison <csharrison@chromium.org>
Reviewed-by: Shivani Sharma <shivanisha@chromium.org>
Cr-Commit-Position: refs/heads/master@{#480188}
[modify] https://crrev.com/305d75ac425d66c5c05fe25873af3f28d1bd148f/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.cc
[modify] https://crrev.com/305d75ac425d66c5c05fe25873af3f28d1bd148f/chrome/browser/subresource_filter/subresource_filter_content_settings_manager_unittest.cc
[modify] https://crrev.com/305d75ac425d66c5c05fe25873af3f28d1bd148f/chrome/browser/subresource_filter/subresource_filter_unittest.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/53b6be3d1bc8833faaefb56579acf5712b35f0fe

commit 53b6be3d1bc8833faaefb56579acf5712b35f0fe
Author: Charles Harrison <csharrison@chromium.org>
Date: Wed Jun 21 12:14:11 2017

[subresource_filter] Add (recommended) next to default Ad settings

Bug:  689487 
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: Ief13d7fb0065f7f252580c3630186a7b441899a9
Reviewed-on: https://chromium-review.googlesource.com/541017
Reviewed-by: Tommy Li <tommycli@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Commit-Queue: Charlie Harrison <csharrison@chromium.org>
Cr-Commit-Position: refs/heads/master@{#481180}
[modify] https://crrev.com/53b6be3d1bc8833faaefb56579acf5712b35f0fe/chrome/android/java/strings/android_chrome_strings.grd
[modify] https://crrev.com/53b6be3d1bc8833faaefb56579acf5712b35f0fe/chrome/app/settings_strings.grdp
[modify] https://crrev.com/53b6be3d1bc8833faaefb56579acf5712b35f0fe/chrome/browser/resources/settings/privacy_page/privacy_page.html
[modify] https://crrev.com/53b6be3d1bc8833faaefb56579acf5712b35f0fe/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/8c0554a8ee2573e6ffc77203b00d657757d2ae8c

commit 8c0554a8ee2573e6ffc77203b00d657757d2ae8c
Author: Charles Harrison <csharrison@chromium.org>
Date: Thu Jun 22 17:54:54 2017

[subresource_filter] Reset smart UI on manual permission change

This patch also updates the smart UI time-to-reset to 24 hours,
from 30 minutes. The shorter time is not necessary since all the
permission work is completed.

Bug:  689487 
Change-Id: I42624747400078c8329881f9cc0326609ce36e7b
Reviewed-on: https://chromium-review.googlesource.com/544316
Commit-Queue: Charlie Harrison <csharrison@chromium.org>
Reviewed-by: Martin Šrámek <msramek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#481595}
[modify] https://crrev.com/8c0554a8ee2573e6ffc77203b00d657757d2ae8c/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.cc
[modify] https://crrev.com/8c0554a8ee2573e6ffc77203b00d657757d2ae8c/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.h
[modify] https://crrev.com/8c0554a8ee2573e6ffc77203b00d657757d2ae8c/chrome/browser/subresource_filter/subresource_filter_content_settings_manager_unittest.cc