[subresource_filter] Implement the "Smart" UI on Android

chrome/browser/subresource_filter/chrome_subresource_filter_client.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_SUBRESOURCE_FILTER_CHROME_SUBRESOURCE_FILTER_CLIENT_H_
 #define CHROME_BROWSER_SUBRESOURCE_FILTER_CHROME_SUBRESOURCE_FILTER_CLIENT_H_
 
 #include "base/macros.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/subresource_filter/content/browser/subresource_filter_client.h"
 
 class GURL;
+class SubresourceFilterContentSettingsManager;
 
 namespace content {
 class WebContents;
 }  // namespace content
 
 // This enum backs a histogram. Make sure new elements are only added to the
 // end. Keep histograms.xml up to date with any changes.
 enum SubresourceFilterAction {
   // Main frame navigation to a different document.
   kActionNavigationStarted = 0,
@@ skipping 23 matching lines @@
   kActionContentSettingsBlockedGlobal,
 
   // A wildcard update. The current content settings API makes this a bit
   // difficult to see whether it is Block or Allow. This should not be a huge
   // problem because this can only be changed from the settings UI, which is
   // relatively rare.
   // TODO(crbug.com/706061): Fix this once content settings API becomes more
   // flexible.
   kActionContentSettingsWildcardUpdate,
 
+  // The UI was suppressed due to "smart" logic which tries not to spam the UI
+  // on navigations within a certain time period.

[engedy, 2017/04/12 14:02:50]

nit: How about:

// on navigations on the same origin within a certain time.

[Charlie Harrison, 2017/04/12 17:53:44]

Done.

+  kActionUISuppressed,
+
+  // The feature was blocked via content setting manually while smart UI was
+  // suppressing the UI. Potentially indicates that the smart UI is too
+  // aggressive if this happens frequently. This is a subset of
+  // kActionContentSettingsBlcoked.

[engedy, 2017/04/12 14:02:50]

nit: typo
nit: Clarify what `being a subset` means, i.e. this is reported alongside that
other action.

[Charlie Harrison, 2017/04/12 17:53:44]

Done.

+  kActionContentSettingsBlockedWhileUISuppressed,
+
   kActionLastEntry
 };
 
 // Chrome implementation of SubresourceFilterClient.
 class ChromeSubresourceFilterClient
     : public subresource_filter::SubresourceFilterClient {
  public:
   explicit ChromeSubresourceFilterClient(content::WebContents* web_contents);
   ~ChromeSubresourceFilterClient() override;
 
   // SubresourceFilterClient:
   void ToggleNotificationVisibility(bool visibility) override;
   bool IsWhitelistedByContentSettings(const GURL& url) override;
   void WhitelistByContentSettings(const GURL& url) override;
   subresource_filter::VerifiedRulesetDealer::Handle* GetRulesetDealer()
       override;
+  void OnActivationComputed(
+      const GURL& url,
+      const subresource_filter::ActivationState& state) override;
 
   static void LogAction(SubresourceFilterAction action);
 
+  bool shown_for_navigation() const { return shown_for_navigation_; }
+
  private:
-  ContentSetting GetContentSettingForUrl(const GURL& url);
+  void OnDidShowUI(const GURL& url);
+
+  // Owned by the profile.
+  SubresourceFilterContentSettingsManager* settings_manager_;
+
   content::WebContents* web_contents_;
   bool shown_for_navigation_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeSubresourceFilterClient);
 };
 
 #endif  // CHROME_BROWSER_SUBRESOURCE_FILTER_CHROME_SUBRESOURCE_FILTER_CLIENT_H_