chrome/browser/ui/cocoa/tab_contents/favicon_util.mm - Issue 10765021: Make the id used in IconMsg_DownloadFavicon unique

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/ui/cocoa/tab_contents/favicon_util.mm

Issue 10765021: Make the id used in IconMsg_DownloadFavicon unique (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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:

OLD	NEW
	(Empty)
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

3 // found in the LICENSE file.

4

5 #include "chrome/browser/ui/cocoa/tab_contents/favicon_util.h"

6

7 #import <AppKit/AppKit.h>

8

9 #include "base/mac/mac_util.h"

10 #include "chrome/browser/favicon/favicon_tab_helper.h"

11 #include "chrome/browser/ui/tab_contents/tab_contents.h"

12 #include "grit/ui_resources.h"

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

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

15 #include "ui/base/resource/resource_bundle.h"

16 #include "ui/gfx/mac/nsimage_cache.h"

17

18 namespace mac {

19

20 NSImage* FaviconForTabContents(TabContents* contents) {

21 if (contents && contents->favicon_tab_helper()->FaviconIsValid()) {

22 CGColorSpaceRef color_space = base::mac::GetSystemColorSpace();

23 NSImage* image = gfx::SkBitmapToNSImageWithColorSpace(

24 contents->favicon_tab_helper()->GetFavicon(), color_space);

25 // The \|image\| could be nil if the bitmap is null. In that case, fallback

26 // to the default image.

27 if (image) {

28 return image;

29 }

30 }

31

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

33 return rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON);

34 }

35

36 } // namespace mac

OLD	NEW