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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2640983002: Rename paint data structures (Closed)
Patch Set: Re-add ios changes 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
« apps/ui/views/app_window_frame_view.cc ('K') | « ash/common/system/user/rounded_image_view.cc ('k') | ash/common/wm/overview/window_grid.cc » ('j') | ash/touch/touch_hud_debug.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 5faeb48024cbfb1d52518da12ee656eb5321e9dc..99b361319bd6d0c7c9fac665531fd7405926c115 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_macros.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(),
« apps/ui/views/app_window_frame_view.cc ('K') | « ash/common/system/user/rounded_image_view.cc ('k') | ash/common/wm/overview/window_grid.cc » ('j') | ash/touch/touch_hud_debug.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698