diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-25 14:23:41 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-25 14:23:41 +0000 |
| commit | a4ae3e1139fb2cf09a9c5dc95baec927b47ab770 (patch) | |
| tree | 732e449f1e510c1eab2d7e8802db97c4d632324a /chrome/browser/cocoa/bookmark_bar_controller.mm | |
| parent | ef8ca82edcb77b5c78fbe8c3a87338713ad72890 (diff) | |
| download | chromium_src-a4ae3e1139fb2cf09a9c5dc95baec927b47ab770.zip chromium_src-a4ae3e1139fb2cf09a9c5dc95baec927b47ab770.tar.gz chromium_src-a4ae3e1139fb2cf09a9c5dc95baec927b47ab770.tar.bz2 | |
Reverting r19244 as it unintentionally broke ui tests: OtherRedirectsDontForkProcess InEmptyFrame TestLifetimeOfDomAutomationController
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19245 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]; |