OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/ui/cocoa/tab_contents/favicon_util.h" | 5 #include "chrome/browser/ui/cocoa/tab_contents/favicon_util.h" |
6 | 6 |
7 #import <AppKit/AppKit.h> | 7 #import <AppKit/AppKit.h> |
8 | 8 |
9 #include "base/mac/mac_util.h" | 9 #include "base/mac/mac_util.h" |
10 #include "chrome/browser/favicon/favicon_tab_helper.h" | 10 #include "chrome/browser/favicon/favicon_tab_helper.h" |
11 #include "chrome/browser/ui/tab_contents/tab_contents.h" | 11 #include "chrome/browser/ui/tab_contents/tab_contents.h" |
| 12 #include "grit/ui_resources_standard.h" |
12 #include "skia/ext/skia_utils_mac.h" | 13 #include "skia/ext/skia_utils_mac.h" |
13 #include "third_party/skia/include/core/SkBitmap.h" | 14 #include "third_party/skia/include/core/SkBitmap.h" |
| 15 #include "ui/base/resource/resource_bundle.h" |
14 #include "ui/gfx/mac/nsimage_cache.h" | 16 #include "ui/gfx/mac/nsimage_cache.h" |
15 | 17 |
16 namespace mac { | 18 namespace mac { |
17 | 19 |
18 NSImage* FaviconForTabContents(TabContents* contents) { | 20 NSImage* FaviconForTabContents(TabContents* contents) { |
19 // FaviconTabHelper returns IDR_DEFAULT_FAVICON, which is a rasterized version | |
20 // of the Mac PDF. Use the PDF so the icon in the Omnibox matches the default | |
21 // favicon. | |
22 if (contents && contents->favicon_tab_helper()->FaviconIsValid()) { | 21 if (contents && contents->favicon_tab_helper()->FaviconIsValid()) { |
23 CGColorSpaceRef color_space = base::mac::GetSystemColorSpace(); | 22 CGColorSpaceRef color_space = base::mac::GetSystemColorSpace(); |
24 NSImage* image = gfx::SkBitmapToNSImageWithColorSpace( | 23 NSImage* image = gfx::SkBitmapToNSImageWithColorSpace( |
25 contents->favicon_tab_helper()->GetFavicon(), color_space); | 24 contents->favicon_tab_helper()->GetFavicon(), color_space); |
26 // The |image| could be nil if the bitmap is null. In that case, fallback | 25 // The |image| could be nil if the bitmap is null. In that case, fallback |
27 // to the default image. | 26 // to the default image. |
28 if (image) { | 27 if (image) { |
29 return image; | 28 return image; |
30 } | 29 } |
31 } | 30 } |
32 | 31 |
33 return gfx::GetCachedImageWithName(@"nav.pdf"); | 32 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
| 33 return rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON); |
34 } | 34 } |
35 | 35 |
36 } // namespace mac | 36 } // namespace mac |
OLD | NEW |