Safe browsing subresource filter bubble UI skeleton.

chrome/browser/ui/content_settings/content_setting_image_model.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
@@ skipping 65 matching lines @@
       WebContents* web_contents,
       Profile* profile) override;
 
   bool ShouldRunAnimation(WebContents* web_contents) override;
   void SetAnimationHasRun(WebContents* web_contents) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ContentSettingMediaImageModel);
 };
 
+// Image model for subresource filter icons in the location bar.
+class ContentSettingSubresourceFilterImageModel

[msramek, 2016/07/27 09:46:21]

Please update the hierarchy comment at the top of this file.

[melandory, 2016/07/27 12:53:41]

Done.

+    : public ContentSettingImageModel {
+ public:
+  ContentSettingSubresourceFilterImageModel();
+
+  void UpdateFromWebContents(WebContents* web_contents) override;
+
+  ContentSettingBubbleModel* CreateBubbleModel(
+      ContentSettingBubbleModel::Delegate* delegate,
+      WebContents* web_contents,
+      Profile* profile) override;
+
+  bool ShouldRunAnimation(content::WebContents* web_contents) override;
+  void SetAnimationHasRun(content::WebContents* web_contents) override;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ContentSettingSubresourceFilterImageModel);
+};
+
 class ContentSettingRPHImageModel : public ContentSettingSimpleImageModel {
  public:
   ContentSettingRPHImageModel();
 
   void UpdateFromWebContents(WebContents* web_contents) override;
 };
 
 class ContentSettingMIDISysExImageModel
     : public ContentSettingSimpleImageModel {
  public:
@@ skipping 138 matching lines @@
   if (content_settings_type == CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS)
     return base::WrapUnique(new ContentSettingRPHImageModel());
 
   if (content_settings_type == CONTENT_SETTINGS_TYPE_MIDI_SYSEX)
     return base::WrapUnique(new ContentSettingMIDISysExImageModel());
 
   return base::WrapUnique(
       new ContentSettingBlockedImageModel(content_settings_type));
 }
 
+std::unique_ptr<ContentSettingImageModel>
+ContentSettingImageModel::CreateSubresourceFilterImageModelForTesting() {
+  return base::WrapUnique(new ContentSettingSubresourceFilterImageModel());
+}
+
 // Generic blocked content settings --------------------------------------------
 
 ContentSettingBlockedImageModel::ContentSettingBlockedImageModel(
     ContentSettingsType content_type)
     : ContentSettingSimpleImageModel(content_type) {
 }
 
 void ContentSettingBlockedImageModel::UpdateFromWebContents(
     WebContents* web_contents) {
   set_visible(false);
@@ skipping 158 matching lines @@
     ContentSettingBubbleModel::Delegate* delegate,
     WebContents* web_contents,
     Profile* profile) {
   return new ContentSettingMediaStreamBubbleModel(delegate,
                                                   web_contents,
                                                   profile);
 }
 
 bool ContentSettingMediaImageModel::ShouldRunAnimation(
     WebContents* web_contents) {
   // TODO(msramek): For bubbles that are not tied to a single content setting,

[msramek, 2016/07/27 09:46:21]

This TODO now applies to ContentSettingSubresourceFilterImageModel as well. Can
you please move it to TabSpecificContentSetting, explain that we're abusing it
for media *and* subresources now, and that we should be ashamed of that?

[melandory, 2016/07/27 12:53:41]

Hope that "this is not ideal" expresses relevant level of being ashamed :) 

   // TabSpecificContentSettings is not a good place to store this bit.
   // Perhaps we should instead use a map<WebContents*, bool> here in
   // ContentSettingMediaImageModel.
   if (!web_contents)
     return false;
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents);
   if (!content_settings)
     return false;
   return (!content_settings->IsBlockageIndicated(
               CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC) &&
           !content_settings->IsBlockageIndicated(
               CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
 }
 
 void ContentSettingMediaImageModel::SetAnimationHasRun(
     WebContents* web_contents) {
   if (!web_contents)
     return;
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents);
   if (content_settings) {
     content_settings->SetBlockageHasBeenIndicated(
         CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
     content_settings->SetBlockageHasBeenIndicated(
         CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
   }
 }
 
+// Subresource Filter ----------------------------------------------------------
+
+ContentSettingSubresourceFilterImageModel::
+    ContentSettingSubresourceFilterImageModel()
+    : ContentSettingImageModel() {}
+
+void ContentSettingSubresourceFilterImageModel::UpdateFromWebContents(
+    WebContents* web_contents) {
+  set_visible(false);
+
+  if (!web_contents)
+    return;
+
+  TabSpecificContentSettings* content_settings =
+      TabSpecificContentSettings::FromWebContents(web_contents);
+
+  if (!content_settings || !content_settings->is_subresource_filter_enabled())
+    return;
+
+  if (!UseVectorGraphics()) {
+    SetIconByResourceId(IDR_SUBRESOURCE_FILTER_ACTIVE);
+  } else {
+    set_icon_by_vector_id(gfx::VectorIconId::SUBRESOURCE_FILTER_ACTIVE,
+                          gfx::VectorIconId::VECTOR_ICON_NONE);
+  }
+  set_explanatory_string_id(IDS_FILTERED_DECEPTIVE_CONTENT_PROMPT_TITLE);
+  // TODO(melandory): Set tooltip text.
+  set_visible(true);
+}
+
+ContentSettingBubbleModel*
+ContentSettingSubresourceFilterImageModel::CreateBubbleModel(
+    ContentSettingBubbleModel::Delegate* delegate,
+    WebContents* web_contents,
+    Profile* profile) {
+  return new ContentSettingSubresourceFilterBubbleModel(delegate, web_contents,
+                                                        profile);
+}
+
+bool ContentSettingSubresourceFilterImageModel::ShouldRunAnimation(
+    WebContents* web_contents) {
+  if (!web_contents)
+    return false;
+  TabSpecificContentSettings* content_settings =
+      TabSpecificContentSettings::FromWebContents(web_contents);
+  return content_settings && content_settings->is_subresource_filter_enabled();

[msramek, 2016/07/27 09:46:21]

This should check if the blockage has been *indicated*, not if the content is
blocked.

[melandory, 2016/07/27 12:53:41]

Done.

+}
+
+void ContentSettingSubresourceFilterImageModel::SetAnimationHasRun(
+    WebContents* web_contents) {
+  if (!web_contents)
+    return;
+  TabSpecificContentSettings* content_settings =
+      TabSpecificContentSettings::FromWebContents(web_contents);
+  if (content_settings)
+    content_settings->SetSubresourceBlockageIndicated();
+}
+
 // Protocol handlers -----------------------------------------------------------
 
 ContentSettingRPHImageModel::ContentSettingRPHImageModel()
     : ContentSettingSimpleImageModel(CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS) {
   if (!UseVectorGraphics()) {
     SetIconByResourceId(IDR_REGISTER_PROTOCOL_HANDLER);
   } else {
     set_icon_by_vector_id(gfx::VectorIconId::PROTOCOL_HANDLER,
                           gfx::VectorIconId::VECTOR_ICON_NONE);
   }
@@ skipping 94 matching lines @@
       new ContentSettingBlockedImageModel(CONTENT_SETTINGS_TYPE_PPAPI_BROKER));
   result.push_back(
       new ContentSettingBlockedImageModel(CONTENT_SETTINGS_TYPE_PLUGINS));
   result.push_back(
       new ContentSettingBlockedImageModel(CONTENT_SETTINGS_TYPE_POPUPS));
   result.push_back(new ContentSettingGeolocationImageModel());
   result.push_back(
       new ContentSettingBlockedImageModel(CONTENT_SETTINGS_TYPE_MIXEDSCRIPT));
   result.push_back(new ContentSettingRPHImageModel());
   result.push_back(new ContentSettingMediaImageModel());
+  result.push_back(new ContentSettingSubresourceFilterImageModel());
   result.push_back(
       new ContentSettingBlockedImageModel(
           CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS));
   result.push_back(new ContentSettingMIDISysExImageModel());
 
   return result;
 }
 
 void ContentSettingImageModel::SetIconByResourceId(int id) {
   raster_icon_id_ = id;
@@ skipping 10 matching lines @@
     UpdateFromWebContents(web_contents);
     return old_vector_icon != vector_icon_id_ &&
            old_badge_icon != vector_icon_badge_id_;
   } else {
     int old_icon = raster_icon_id_;
     UpdateFromWebContents(web_contents);
     return old_icon != raster_icon_id_;
   }
 }
 #endif