chrome/browser/extensions/extension_icon_image.h - 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/extensions/extension_icon_image.h

Issue 24175004: Remove dependency on ui::ScaleFactor from ui/gfx (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix new usage of scale in FastShowPickler 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/extensions/extension_icon_image.h

diff --git a/chrome/browser/extensions/extension_icon_image.h b/chrome/browser/extensions/extension_icon_image.h

index d1ddd57f2bc74f96746a8adca90ffbd2917e9f03..94cdae5d6fc606c19562c289f8a7af3aa26d4f65 100644

--- a/chrome/browser/extensions/extension_icon_image.h

+++ b/chrome/browser/extensions/extension_icon_image.h

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

#include "chrome/common/extensions/extension_icon_set.h"

#include "content/public/browser/notification_observer.h"

#include "content/public/browser/notification_registrar.h"

+#include "ui/base/layout.h"

#include "ui/gfx/image/image_skia.h"

class Profile;

@@ -81,7 +82,7 @@ class IconImage : public content::NotificationObserver {

// observer's |OnExtensionIconImageLoaded| will be called.

gfx::ImageSkiaRep LoadImageForScaleFactor(ui::ScaleFactor scale_factor);

- void OnImageLoaded(ui::ScaleFactor scale_factor, const gfx::Image& image);

+ void OnImageLoaded(float scale_factor, const gfx::Image& image);

// content::NotificationObserver overrides:

virtual void Observe(int type,