[subresource_filter] Replace the infobar with the experimental infobar

Desktop / Chromium - Charles Harrison [chromium.org] - 15 June 2017 18:22 EDT

This CL replaces the subresource filter infobar with an "AdsBlockedInfobar" and updates strings accordingly. This infobar will be used on master for filtering on pages just after a safe browsing interstitial. Other uses (e.g. for blocking more generally on sites which show intrusive ads) is still behind a flag

Bug: 689992 Change-Id: I62bf99e3f67e4a32fec8820f5bdad0b93da3d17e Reviewed-on: https://chromium-review.googlesource.com/526092 Commit-Queue: Charlie Harrison

a18f38c [subresource_filter] Replace the infobar with the experimental infobar
...rimentalInfoBar.java => AdsBlockedInfoBar.java} | 21 ++---
.../browser/infobar/SubresourceFilterInfoBar.java | 37 ---------
chrome/android/java_sources.gni | 3 +-
chrome/app/generated_resources.grd | 14 +++-
chrome/browser/BUILD.gn | 3 +-
.../chrome_subresource_filter_client.cc | 7 +-
chrome/browser/ui/BUILD.gn | 8 +-
.../ads_blocked_infobar_delegate.cc | 79 +++++++++++++++++++
...r_delegate.h => ads_blocked_infobar_delegate.h} | 27 +++----
.../subresource_filter_infobar_delegate.cc | 90 ----------------------
.../ui/android/infobars/ads_blocked_infobar.cc | 42 ++++++++++
.../ui/android/infobars/ads_blocked_infobar.h | 27 +++++++
.../android/infobars/subresource_filter_infobar.cc | 54 -------------
.../android/infobars/subresource_filter_infobar.h | 27 -------
components/infobars/core/infobar_delegate.h | 2 +-
tools/metrics/histograms/enums.xml | 2 +-
16 files changed, 193 insertions(+), 250 deletions(-)

Upstream: git.chromium.org


  • Share