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

Unified Diff: ash/common/wm/dock/docked_window_layout_manager.cc

Issue 2640983002: Rename paint data structures (Closed)
Patch Set: Rebase Created 3 years, 11 months 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
Index: ash/common/wm/dock/docked_window_layout_manager.cc
diff --git a/ash/common/wm/dock/docked_window_layout_manager.cc b/ash/common/wm/dock/docked_window_layout_manager.cc
index 68bba9ae3cc061a123acb5cf164dfd165a79e4d7..99b95b70c648359c603d19cd780e0d6ab8810e90 100644
--- a/ash/common/wm/dock/docked_window_layout_manager.cc
+++ b/ash/common/wm/dock/docked_window_layout_manager.cc
@@ -24,7 +24,6 @@
#include "base/metrics/histogram.h"
#include "grit/ash_resources.h"
#include "third_party/skia/include/core/SkColor.h"
-#include "third_party/skia/include/core/SkPaint.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/compositor/paint_recorder.h"
#include "ui/compositor/scoped_layer_animation_settings.h"
@@ -95,7 +94,7 @@ class DockedBackgroundWidget : public views::Widget,
const gfx::ImageSkia& shelf_background(alignment_ == DOCKED_ALIGNMENT_LEFT
? shelf_background_left_
: shelf_background_right_);
- SkPaint paint;
+ cc::PaintFlags paint;
paint.setAlpha(asset_background_alpha_);
recorder.canvas()->DrawImageInt(
shelf_background, 0, 0, shelf_background.width(),

Powered by Google App Engine
This is Rietveld 408576698