chrome/browser/icon_loader_mac.mm - Issue 10703173: Enable hidpi download UI

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/icon_loader_mac.mm

Issue 10703173: Enable hidpi download UI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed mac bugs Created 8 years, 5 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/icon_loader_mac.mm

diff --git a/chrome/browser/icon_loader_mac.mm b/chrome/browser/icon_loader_mac.mm

index 2e35a93f3bd255185f9ac6a74de2d3dbe1df5dd4..7ec09ac2419d59cc165518006f63e33f92a0b4b6 100644

--- a/chrome/browser/icon_loader_mac.mm

+++ b/chrome/browser/icon_loader_mac.mm

@@ -10,8 +10,8 @@

#include "base/message_loop.h"

#include "base/threading/thread.h"

#include "base/sys_string_conversions.h"

-#include "skia/ext/skia_utils_mac.h"

-#include "third_party/skia/include/core/SkBitmap.h"

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

+#include "ui/gfx/image/image_skia_util_mac.h"

void IconLoader::ReadIcon() {

NSString* group = base::SysUTF8ToNSString(group_);

@@ -33,7 +33,7 @@ void IconLoader::ReadIcon() {

default:

NOTREACHED();

}

- image_.reset(new gfx::Image(gfx::NSImageToSkBitmap(icon, size, false)));

+ image_.reset(new gfx::Image(gfx::ImageSkiaFromResizedNSImage(icon, size)));

}

target_message_loop_->PostTask(FROM_HERE,

« no previous file with comments | « chrome/browser/icon_loader_chromeos.cc ('k') | no next file » | no next file with comments »