ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia.

ash/app_list/drop_shadow_label.cc

 // Copyright (c) 2011 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.
 
 #include "ash/app_list/drop_shadow_label.h"
 
 #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"
 
 using views::Label;
 
 namespace ash {
 
 static const int kDefaultDropShadowSize = 2;
 
 DropShadowLabel::DropShadowLabel() : drop_shadow_size_(kDefaultDropShadowSize) {
@@ skipping 89 matching lines @@
 }
 
 gfx::Size DropShadowLabel::GetTextSize() const {
   gfx::Size text_size = Label::GetTextSize();
   text_size.SetSize(text_size.width() + drop_shadow_size_,
                     text_size.height() + drop_shadow_size_);
   return text_size;
 }
 
 }  // namespace ash