Vectorize website settings icons in omnibox

chrome/browser/ui/views/location_bar/content_setting_image_view.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/views/location_bar/content_setting_image_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
 #include "chrome/browser/ui/views/content_setting_bubble_contents.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/widget/widget.h"
 
 
 namespace {
 const int kBackgroundImages[] = IMAGE_GRID(IDR_OMNIBOX_CONTENT_SETTING_BUBBLE);
 const int kStayOpenTimeMS = 3200;  // Time spent with animation fully open.
@@ skipping 42 matching lines @@
 void ContentSettingImageView::Update(content::WebContents* web_contents) {
   // Note: We explicitly want to call this even if |web_contents| is NULL, so we
   // get hidden properly while the user is editing the omnibox.
   content_setting_image_model_->UpdateFromWebContents(web_contents);
 
   if (!content_setting_image_model_->is_visible()) {
     SetVisible(false);
     return;
   }
 
-  SetImage(*ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-      content_setting_image_model_->get_icon()));
+  SetImage(content_setting_image_model_->icon().AsImageSkia());
   image()->SetTooltipText(
       base::UTF8ToUTF16(content_setting_image_model_->get_tooltip()));
   SetVisible(true);
 
   // If the content blockage should be indicated to the user, start the
   // animation and record that we indicated the blockage.
   TabSpecificContentSettings* content_settings = web_contents ?
       TabSpecificContentSettings::FromWebContents(web_contents) : NULL;
   if (!content_settings || content_settings->IsBlockageIndicated(
       content_setting_image_model_->get_content_settings_type()))
@@ skipping 104 matching lines @@
         parent_->delegate()->CreateViewsBubble(new ContentSettingBubbleContents(
             ContentSettingBubbleModel::CreateContentSettingBubbleModel(
                 parent_->delegate()->GetContentSettingBubbleModelDelegate(),
                 web_contents, parent_->profile(),
                 content_setting_image_model_->get_content_settings_type()),
             web_contents, this, views::BubbleBorder::TOP_RIGHT));
     bubble_widget_->AddObserver(this);
     bubble_widget_->Show();
   }
 }