diff options
Diffstat (limited to 'chrome/browser/ui/views/dropdown_bar_view.cc')
| -rw-r--r-- | chrome/browser/ui/views/dropdown_bar_view.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/chrome/browser/ui/views/dropdown_bar_view.cc b/chrome/browser/ui/views/dropdown_bar_view.cc index 42e1f3b..dd91908 100644 --- a/chrome/browser/ui/views/dropdown_bar_view.cc +++ b/chrome/browser/ui/views/dropdown_bar_view.cc @@ -13,7 +13,6 @@ #include "third_party/skia/include/core/SkRect.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/image/image_skia.h" #include "ui/views/background.h" #include "ui/views/border.h" #include "ui/views/painter.h" @@ -30,8 +29,8 @@ const int kAnimatingEdgeHeight = 5; class DropdownBackground : public views::Background { public: explicit DropdownBackground(BrowserView* browser, - const gfx::ImageSkia* left_alpha_mask, - const gfx::ImageSkia* right_alpha_mask); + const SkBitmap* left_alpha_mask, + const SkBitmap* right_alpha_mask); virtual ~DropdownBackground() {} // Overridden from views::Background. @@ -39,15 +38,15 @@ class DropdownBackground : public views::Background { private: BrowserView* browser_view_; - const gfx::ImageSkia* left_alpha_mask_; - const gfx::ImageSkia* right_alpha_mask_; + const SkBitmap* left_alpha_mask_; + const SkBitmap* right_alpha_mask_; DISALLOW_COPY_AND_ASSIGN(DropdownBackground); }; DropdownBackground::DropdownBackground(BrowserView* browser_view, - const gfx::ImageSkia* left_alpha_mask, - const gfx::ImageSkia* right_alpha_mask) + const SkBitmap* left_alpha_mask, + const SkBitmap* right_alpha_mask) : browser_view_(browser_view), left_alpha_mask_(left_alpha_mask), right_alpha_mask_(right_alpha_mask) { @@ -123,8 +122,8 @@ void DropdownBarView::OnPaint(gfx::Canvas* canvas) { //////////////////////////////////////////////////////////////////////////////// // DropDownBarView, protected: -void DropdownBarView::SetBackground(const gfx::ImageSkia* left_alpha_mask, - const gfx::ImageSkia* right_alpha_mask) { +void DropdownBarView::SetBackground(const SkBitmap* left_alpha_mask, + const SkBitmap* right_alpha_mask) { set_background(new DropdownBackground(host()->browser_view(), left_alpha_mask, right_alpha_mask)); } |