Fix vectorized icon for PPAPI broker website setting icon

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 "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/grit/generated_resources.h"
@@ skipping 16 matching lines @@
 namespace {
 
 bool UseVectorGraphics() {
 #if defined(OS_MACOSX)
   return false;
 #else
   return ui::MaterialDesignController::IsModeMaterial();
 #endif
 }
 
+#if !defined(OS_MACOSX)
+// Gets a vector icon badged with |badge|.
+gfx::Image GetIcon(gfx::VectorIconId id, gfx::VectorIconId badge) {
+  SkColor icon_color;
+  ui::CommonThemeGetSystemColor(ui::NativeTheme::kColorId_ChromeIconGrey,
+                                &icon_color);
+  return gfx::Image(gfx::CreateVectorIconWithBadge(id, 16, icon_color, badge));
+}
+#endif
+
 }  // namespace
 
 class ContentSettingBlockedImageModel : public ContentSettingImageModel {
  public:
   explicit ContentSettingBlockedImageModel(
       ContentSettingsType content_settings_type);
 
   void UpdateFromWebContents(WebContents* web_contents) override;
 };
 
@@ skipping 91 matching lines @@
       break;
     case CONTENT_SETTINGS_TYPE_PLUGINS:
       vector_icon_id = gfx::VectorIconId::EXTENSION;
       break;
     case CONTENT_SETTINGS_TYPE_POPUPS:
       vector_icon_id = gfx::VectorIconId::WEB;
       break;
     case CONTENT_SETTINGS_TYPE_MIXEDSCRIPT:
       vector_icon_id = gfx::VectorIconId::MIXED_CONTENT;
       break;
-    // TODO(estade): change this one?
     case CONTENT_SETTINGS_TYPE_PPAPI_BROKER:
       vector_icon_id = gfx::VectorIconId::EXTENSION;
       break;
     case CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS:
       vector_icon_id = gfx::VectorIconId::FILE_DOWNLOAD;
       break;
     default:
       // If we didn't find a vector icon ID we shouldn't have found an
       // asset ID either.
       DCHECK_EQ(0, icon_id);
@@ skipping 69 matching lines @@
         kAccessedTooltipIDs, arraysize(kAccessedTooltipIDs), type);
     explanation_id = 0;
   }
   set_visible(true);
   if (!UseVectorGraphics()) {
     DCHECK(icon_id);
     SetIconByResourceId(icon_id);
 #if !defined(OS_MACOSX)
   } else {
     DCHECK(gfx::VectorIconId::VECTOR_ICON_NONE != vector_icon_id);
-    SetIconByVectorId(vector_icon_id, content_settings->IsContentBlocked(type));
+
+    if (type == CONTENT_SETTINGS_TYPE_PPAPI_BROKER) {
+      set_icon(GetIcon(vector_icon_id, gfx::VectorIconId::WARNING_BADGE));
+    } else {
+      SetIconByVectorId(vector_icon_id,
+                        content_settings->IsContentBlocked(type));
+    }
 #endif
   }
   set_explanatory_string_id(explanation_id);
   DCHECK(tooltip_id);
   set_tooltip(l10n_util::GetStringUTF8(tooltip_id));
 }
 
 ContentSettingGeolocationImageModel::ContentSettingGeolocationImageModel()
     : ContentSettingImageModel(CONTENT_SETTINGS_TYPE_GEOLOCATION) {
 }
@@ skipping 204 matching lines @@
 }
 
 void ContentSettingImageModel::SetIconByResourceId(int id) {
   icon_id_ = id;
   icon_ = ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(id);
 }
 
 #if !defined(OS_MACOSX)
 void ContentSettingImageModel::SetIconByVectorId(gfx::VectorIconId id,
                                                  bool blocked) {
-  SkColor icon_color;
-  ui::CommonThemeGetSystemColor(ui::NativeTheme::kColorId_ChromeIconGrey,
-                                &icon_color);
-  icon_ = gfx::Image(gfx::CreateVectorIconWithBadge(
-      id, 16, icon_color, blocked ? gfx::VectorIconId::BLOCKED_BADGE
-                                  : gfx::VectorIconId::VECTOR_ICON_NONE));
+  icon_ = GetIcon(id, blocked ? gfx::VectorIconId::BLOCKED_BADGE
+                              : gfx::VectorIconId::VECTOR_ICON_NONE);
 }
 #endif