chrome/browser/ui/views/location_bar/content_setting_image_view.cc - Issue 24175004: Remove dependency on ui::ScaleFactor from ui/gfx

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 24175004: Remove dependency on ui::ScaleFactor from ui/gfx (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rename methods and vars to make image_scale more clear Created 7 years, 3 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 3920d7e3400c7361b9025bad7729006d439ff377..e0b1c38739868dbf951539c5d5972cef476d14ae 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

@@ -66,8 +66,7 @@ ContentSettingImageView::ContentSettingImageView(

// sit atop.

const SkBitmap& bitmap(

ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(

- kBackgroundImages[4])->GetRepresentation(

- ui::SCALE_FACTOR_100P).sk_bitmap());

+ kBackgroundImages[4])->GetRepresentation(1.0f).sk_bitmap());

SkAutoLockPixels pixel_lock(bitmap);

SkColor background_image_color =

bitmap.getColor(bitmap.width() / 2, bitmap.height() / 2);