chrome/browser/icon_loader_mac.mm - Issue 2586003002: patch from issue 2577273002 at patchset 20001 (http://crrev.com/2577273002#ps20001)

Side by Side Diff

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

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

Side by Side Diff: chrome/browser/icon_loader_mac.mm

Issue 2586003002: patch from issue 2577273002 at patchset 20001 (http://crrev.com/2577273002#ps20001)

Patch Set: Convert to OnceCallback, and make it compile at least on Linux. Created 4 years ago

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

Jump to:

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

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/icon_loader.h"	5 #include "chrome/browser/icon_loader.h"

6	6

7 #import <AppKit/AppKit.h>	7 #import <AppKit/AppKit.h>

8	8

9 #include "base/bind.h"	9 #include "base/bind.h"

10 #include "base/files/file_path.h"	10 #include "base/files/file_path.h"

(...skipping 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
46 NOTREACHED();	46 NOTREACHED();

47 }	47 }

48 gfx::ImageSkia image_skia(gfx::ImageSkiaFromResizedNSImage(icon, size));	48 gfx::ImageSkia image_skia(gfx::ImageSkiaFromResizedNSImage(icon, size));

49 if (!image_skia.isNull()) {	49 if (!image_skia.isNull()) {

50 image_skia.MakeThreadSafe();	50 image_skia.MakeThreadSafe();

51 image_.reset(new gfx::Image(image_skia));	51 image_.reset(new gfx::Image(image_skia));

52 }	52 }

53 }	53 }

54	54

55 target_task_runner_->PostTask(FROM_HERE,	55 target_task_runner_->PostTask(FROM_HERE,

56 base::Bind(&IconLoader::NotifyDelegate, this));	56 base::Bind(callback_, base::Unretained(this),

	57 base::Passed(&image_), group_));

57 }	58 }

OLD	NEW