chrome/browser/ui/views/location_bar/content_setting_image_view.cc - Issue 1313603003: Vectorize website settings icons in omnibox

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/location_bar/content_setting_image_view.cc

Issue 1313603003: Vectorize website settings icons in omnibox (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: change DCHECK Created 5 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/ui/views/location_bar/content_setting_image_view.cc

diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc

index 7e041a20f023831f63541078b307ec7ef3c5d9b1..1de65954169aab41560a25ae2e462040d2b94cf2 100644

--- a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc

+++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc

@@ -13,7 +13,6 @@

#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"

@@ -76,8 +75,7 @@ void ContentSettingImageView::Update(content::WebContents* web_contents) {

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);