summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-09 00:30:59 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-09 00:30:59 +0000
commit94a0d258287787cf09854492ce889eb14273c059 (patch)
treeff242b01f90ee3888fd10a1583b03268b9a15eb0 /ash
parentfbddf8352b68292d26191060d37c3f0820c8875c (diff)
downloadchromium_src-94a0d258287787cf09854492ce889eb14273c059.zip
chromium_src-94a0d258287787cf09854492ce889eb14273c059.tar.gz
chromium_src-94a0d258287787cf09854492ce889eb14273c059.tar.bz2
ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia.
The final goal is to merge these two classes into a single gfx::Canvas class. BUG=116572 R=ben@chromium.org,asvitkine@chromium.org TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/9562038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125735 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/app_list/drop_shadow_label.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/app_list/drop_shadow_label.cc b/ash/app_list/drop_shadow_label.cc
index 0543aec..169890f 100644
--- a/ash/app_list/drop_shadow_label.cc
+++ b/ash/app_list/drop_shadow_label.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -6,7 +6,7 @@
#include "base/utf_string_conversions.h"
#include "third_party/skia/include/effects/SkGradientShader.h"
-#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/canvas.h"
#include "ui/gfx/color_utils.h"
#include "ui/gfx/skbitmap_operations.h"