Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2552)

Unified Diff: chrome/browser/views/bookmark_bar_view.cc

Issue 12842: Move convolver, image_operations, and skia_utils from base/gfx to skia/ext.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/importer/importer.cc ('k') | chrome/browser/views/bookmark_manager_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/bookmark_bar_view.cc
===================================================================
--- chrome/browser/views/bookmark_bar_view.cc (revision 6142)
+++ chrome/browser/views/bookmark_bar_view.cc (working copy)
@@ -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 @@
// 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 @@
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 @@
// 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 @@
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);
« no previous file with comments | « chrome/browser/importer/importer.cc ('k') | chrome/browser/views/bookmark_manager_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698