chrome/browser/ui/views/tab_icon_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/tab_icon_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/tab_icon_view.cc

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

index 433e36f0c2ff7efc4843b3ef8351e2aa7d8c3cbe..ab13cd6410ce0d00a9140a417dae37b91dcb73f4 100644

--- a/chrome/browser/ui/views/tab_icon_view.cc

+++ b/chrome/browser/ui/views/tab_icon_view.cc

@@ -39,8 +39,7 @@ void TabIconView::InitializeIfNeeded() {

HICON app_icon = GetAppIcon();

scoped_ptr<SkBitmap> bitmap(

IconUtil::CreateSkBitmapFromHICON(app_icon, gfx::Size(16, 16)));

- g_default_favicon = new gfx::ImageSkia(

- gfx::ImageSkiaRep(*bitmap, ui::SCALE_FACTOR_100P));

+ g_default_favicon = new gfx::ImageSkia(gfx::ImageSkiaRep(*bitmap, 1.0f));

DestroyIcon(app_icon);

#else

ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();