diff options
Diffstat (limited to 'chrome/browser/views/bookmark_bar_view.cc')
-rw-r--r-- | chrome/browser/views/bookmark_bar_view.cc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index aaca5af..49d817b 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -7,7 +7,6 @@ #include <limits> #include "base/base_drag_source.h" -#include "base/gfx/skia_utils.h" #include "chrome/app/theme/theme_resources.h" #include "chrome/browser/bookmarks/bookmark_context_menu.h" #include "chrome/browser/bookmarks/bookmark_utils.h" @@ -45,6 +44,7 @@ #include "chrome/views/widget.h" #include "chrome/views/window.h" #include "generated_resources.h" +#include "skia/ext/skia_utils.h" using views::BaseButton; using views::DropTargetEvent; @@ -255,7 +255,7 @@ class BookmarkButton : public views::TextButton { // the parent's actual bounds because they differ from what is painted. SkPaint paint; paint.setAlpha(static_cast<int>((1.0 - animation_value) * 255)); - paint.setShader(gfx::CreateGradientShader(0, + paint.setShader(skia::CreateGradientShader(0, view->height() + kTopMargin + kBottomMargin, kTopBorderColor, kBackgroundColor))->safeUnref(); @@ -603,16 +603,16 @@ class ButtonSeparatorView : public views::View { virtual void Paint(ChromeCanvas* canvas) { SkPaint paint; - paint.setShader(gfx::CreateGradientShader(0, - height() / 2, - kTopBorderColor, - kSeparatorColor))->safeUnref(); + paint.setShader(skia::CreateGradientShader(0, + height() / 2, + kTopBorderColor, + kSeparatorColor))->safeUnref(); SkRect rc = {SkIntToScalar(kSeparatorStartX), SkIntToScalar(0), SkIntToScalar(1), SkIntToScalar(height() / 2) }; canvas->drawRect(rc, paint); SkPaint paint_down; - paint_down.setShader(gfx::CreateGradientShader(height() / 2, + paint_down.setShader(skia::CreateGradientShader(height() / 2, height(), kSeparatorColor, kBackgroundColor))->safeUnref(); @@ -904,10 +904,10 @@ void BookmarkBarView::Paint(ChromeCanvas* canvas) { // Draw our background. SkPaint paint; paint.setAntiAlias(true); - paint.setShader(gfx::CreateGradientShader(0, - height(), - kTopBorderColor, - kBackgroundColor))->safeUnref(); + paint.setShader(skia::CreateGradientShader(0, + height(), + kTopBorderColor, + kBackgroundColor))->safeUnref(); canvas->drawRoundRect(rect, SkDoubleToScalar(roundness), @@ -924,10 +924,10 @@ void BookmarkBarView::Paint(ChromeCanvas* canvas) { SkDoubleToScalar(roundness), border_paint); } else { SkPaint paint; - paint.setShader(gfx::CreateGradientShader(0, - height(), - kTopBorderColor, - kBackgroundColor))->safeUnref(); + paint.setShader(skia::CreateGradientShader(0, + height(), + kTopBorderColor, + kBackgroundColor))->safeUnref(); canvas->FillRectInt(0, 0, width(), height(), paint); canvas->FillRectInt(kTopBorderColor, 0, 0, width(), 1); |