diff options
| author | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-18 21:41:58 +0000 |
|---|---|---|
| committer | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-18 21:41:58 +0000 |
| commit | ac7f222757304095a60909ae7adc3ba22548632e (patch) | |
| tree | db53e2c99be4a8a40999c78adcb78965c9a23d47 /chrome/browser/cocoa/bookmark_bar_controller.mm | |
| parent | 2b68c89d7ebca6f0d85d5fb9d7ffe819d3c3a9a8 (diff) | |
| download | chromium_src-ac7f222757304095a60909ae7adc3ba22548632e.zip chromium_src-ac7f222757304095a60909ae7adc3ba22548632e.tar.gz chromium_src-ac7f222757304095a60909ae7adc3ba22548632e.tar.bz2 | |
Reverting r18743.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18755 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, 5 insertions, 3 deletions
diff --git a/chrome/browser/cocoa/bookmark_bar_controller.mm b/chrome/browser/cocoa/bookmark_bar_controller.mm index ad92820..e30a1a2 100644 --- a/chrome/browser/cocoa/bookmark_bar_controller.mm +++ b/chrome/browser/cocoa/bookmark_bar_controller.mm @@ -10,10 +10,12 @@ #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" -#include "skia/ext/skia_utils_mac.h" + +using namespace CocoaUtils; @interface BookmarkBarController(Private) - (void)applyContentAreaOffset:(BOOL)apply; @@ -165,7 +167,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 = gfx::SkBitmapToNSImage(favicon); + NSImage* image = SkBitmapToNSImage(favicon); if (image) { [cell setImage:image]; [cell setImagePosition:NSImageLeft]; @@ -293,7 +295,7 @@ const CGFloat kBookmarkHorizontalPadding = 8.0; void* pointer = [[cell representedObject] pointerValue]; BookmarkNode* cellnode = static_cast<BookmarkNode*>(pointer); if (cellnode == node) { - NSImage* image = gfx::SkBitmapToNSImage(bookmarkModel_->GetFavIcon(node)); + NSImage* image = SkBitmapToNSImage(bookmarkModel_->GetFavIcon(node)); if (image) { [cell setImage:image]; [cell setImagePosition:NSImageLeft]; |