diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-25 18:16:39 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-25 18:16:39 +0000 |
| commit | 3194e1ed74d74c12ff6dc6b9c0b0b5236cb1634a (patch) | |
| tree | b7e5e5277693298bcfaf1c3149e34a2789636314 /chrome/browser/cocoa/bookmark_bar_controller.mm | |
| parent | 291d87ee329b9283c74125bbd933f19e629dcac1 (diff) | |
| download | chromium_src-3194e1ed74d74c12ff6dc6b9c0b0b5236cb1634a.zip chromium_src-3194e1ed74d74c12ff6dc6b9c0b0b5236cb1634a.tar.gz chromium_src-3194e1ed74d74c12ff6dc6b9c0b0b5236cb1634a.tar.bz2 | |
Add favicons to tabs on the Mac. Also moved SkBitmapToNSImage() to
skia/ext/skia_utils_mac.h and removed chrome/browser/cocoa/cocoa_utils.h.
Patch by rsesek.
BUG=13565
http://codereview.chromium.org/131018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19266 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/bookmark_bar_controller.mm')
| -rw-r--r-- | chrome/browser/cocoa/bookmark_bar_controller.mm | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/cocoa/bookmark_bar_controller.mm b/chrome/browser/cocoa/bookmark_bar_controller.mm index e30a1a2..ad92820 100644 --- a/chrome/browser/cocoa/bookmark_bar_controller.mm +++ b/chrome/browser/cocoa/bookmark_bar_controller.mm @@ -10,12 +10,10 @@ #import "chrome/browser/cocoa/bookmark_bar_controller.h" #import "chrome/browser/cocoa/bookmark_bar_view.h" #import "chrome/browser/cocoa/bookmark_button_cell.h" -#import "chrome/browser/cocoa/cocoa_utils.h" #include "chrome/browser/profile.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" - -using namespace CocoaUtils; +#include "skia/ext/skia_utils_mac.h" @interface BookmarkBarController(Private) - (void)applyContentAreaOffset:(BOOL)apply; @@ -167,7 +165,7 @@ const CGFloat kBookmarkHorizontalPadding = 8.0; // (and their icons) are loaded on the IO thread to speed launch. const SkBitmap& favicon = bookmarkModel_->GetFavIcon(node); if (!favicon.isNull()) { - NSImage* image = SkBitmapToNSImage(favicon); + NSImage* image = gfx::SkBitmapToNSImage(favicon); if (image) { [cell setImage:image]; [cell setImagePosition:NSImageLeft]; @@ -295,7 +293,7 @@ const CGFloat kBookmarkHorizontalPadding = 8.0; void* pointer = [[cell representedObject] pointerValue]; BookmarkNode* cellnode = static_cast<BookmarkNode*>(pointer); if (cellnode == node) { - NSImage* image = SkBitmapToNSImage(bookmarkModel_->GetFavIcon(node)); + NSImage* image = gfx::SkBitmapToNSImage(bookmarkModel_->GetFavIcon(node)); if (image) { [cell setImage:image]; [cell setImagePosition:NSImageLeft]; |