diff options
Diffstat (limited to 'chrome/browser/ui/cocoa/infobars')
5 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/ui/cocoa/infobars/infobar_controller.mm b/chrome/browser/ui/cocoa/infobars/infobar_controller.mm index dd9725c..d45447f 100644 --- a/chrome/browser/ui/cocoa/infobars/infobar_controller.mm +++ b/chrome/browser/ui/cocoa/infobars/infobar_controller.mm @@ -14,8 +14,8 @@ #include "chrome/browser/ui/cocoa/infobars/infobar.h" #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h" -#include "skia/ext/skia_utils_mac.h" #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/gfx/image.h" #include "webkit/glue/window_open_disposition.h" namespace { @@ -113,7 +113,7 @@ const float kAnimateCloseDuration = 0.12; - (void)awakeFromNib { DCHECK(delegate_); if (delegate_->GetIcon()) { - [image_ setImage:gfx::SkBitmapToNSImage(*(delegate_->GetIcon()))]; + [image_ setImage:*(delegate_->GetIcon())]; } else { // No icon, remove it from the view and grow the textfield to include the // space. diff --git a/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.cc b/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.cc index e5a75e1..6cc13bf 100644 --- a/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.cc +++ b/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.cc @@ -28,7 +28,7 @@ void MockConfirmInfoBarDelegate::InfoBarClosed() { closed_ = true; } -SkBitmap* MockConfirmInfoBarDelegate::GetIcon() const { +gfx::Image* MockConfirmInfoBarDelegate::GetIcon() const { icon_accessed_ = true; return NULL; } diff --git a/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h b/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h index 7e7539a..7a05597 100644 --- a/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h +++ b/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h @@ -32,7 +32,7 @@ class MockConfirmInfoBarDelegate : public ConfirmInfoBarDelegate { private: // ConfirmInfoBarDelegate: virtual void InfoBarClosed() OVERRIDE; - virtual SkBitmap* GetIcon() const OVERRIDE; + virtual gfx::Image* GetIcon() const OVERRIDE; virtual string16 GetMessageText() const OVERRIDE; virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE; virtual bool Accept() OVERRIDE; diff --git a/chrome/browser/ui/cocoa/infobars/mock_link_infobar_delegate.cc b/chrome/browser/ui/cocoa/infobars/mock_link_infobar_delegate.cc index 51bc760..8c7d4f6 100644 --- a/chrome/browser/ui/cocoa/infobars/mock_link_infobar_delegate.cc +++ b/chrome/browser/ui/cocoa/infobars/mock_link_infobar_delegate.cc @@ -27,7 +27,7 @@ void MockLinkInfoBarDelegate::InfoBarClosed() { closed_ = true; } -SkBitmap* MockLinkInfoBarDelegate::GetIcon() const { +gfx::Image* MockLinkInfoBarDelegate::GetIcon() const { icon_accessed_ = true; return NULL; } diff --git a/chrome/browser/ui/cocoa/infobars/mock_link_infobar_delegate.h b/chrome/browser/ui/cocoa/infobars/mock_link_infobar_delegate.h index ace696c..a4f6ff7 100644 --- a/chrome/browser/ui/cocoa/infobars/mock_link_infobar_delegate.h +++ b/chrome/browser/ui/cocoa/infobars/mock_link_infobar_delegate.h @@ -31,7 +31,7 @@ class MockLinkInfoBarDelegate : public LinkInfoBarDelegate { private: // LinkInfoBarDelegate: virtual void InfoBarClosed() OVERRIDE; - virtual SkBitmap* GetIcon() const OVERRIDE; + virtual gfx::Image* GetIcon() const OVERRIDE; virtual string16 GetMessageTextWithOffset(size_t* link_offset) const OVERRIDE; virtual string16 GetLinkText() const OVERRIDE; virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE; |