Revert 50784 - Canvas refactoring part 3....

chrome/browser/views/create_application_shortcut_view.cc

 // Copyright (c) 2009 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 "chrome/browser/views/create_application_shortcut_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/callback.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/pref_names.h"
-#include "gfx/canvas_skia.h"
+#include "gfx/canvas.h"
 #include "gfx/codec/png_codec.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
@@ skipping 135 matching lines @@
     SkIntToScalar(bounds.x()),
     SkIntToScalar(bounds.y()),
     SkIntToScalar(bounds.right()),
     SkIntToScalar(bounds.bottom())
   };
 
   SkPaint border_paint;
   border_paint.setAntiAlias(true);
   border_paint.setARGB(0xFF, 0xC8, 0xC8, 0xC8);
 
-  canvas->AsCanvasSkia()->drawRoundRect(
-      border_rect, SkIntToScalar(2), SkIntToScalar(2), border_paint);
+  canvas->drawRoundRect(border_rect, SkIntToScalar(2), SkIntToScalar(2),
+      border_paint);
 
   SkRect inner_rect = {
     border_rect.fLeft + SkDoubleToScalar(0.5),
     border_rect.fTop + SkDoubleToScalar(0.5),
     border_rect.fRight - SkDoubleToScalar(0.5),
     border_rect.fBottom - SkDoubleToScalar(0.5),
   };
 
   SkPaint inner_paint;
   inner_paint.setAntiAlias(true);
   inner_paint.setARGB(0xFF, 0xF8, 0xF8, 0xF8);
-  canvas->AsCanvasSkia()->drawRoundRect(
-      inner_rect, SkIntToScalar(1.5), SkIntToScalar(1.5), inner_paint);
+  canvas->drawRoundRect(inner_rect, SkIntToScalar(1.5), SkIntToScalar(1.5),
+      inner_paint);
 }
 
 };  // namespace
 
 namespace browser {
 
 void ShowCreateShortcutsDialog(gfx::NativeWindow parent_window,
                                TabContents* tab_contents) {
   views::Window::CreateChromeWindow(parent_window, gfx::Rect(),
       new CreateApplicationShortcutView(tab_contents))->Show();
@@ skipping 250 matching lines @@
                                                      const SkBitmap& image) {
   pending_download_ = NULL;
 
   if (!errored && !image.isNull()) {
     shortcut_info_.favicon = image;
     static_cast<AppInfoView*>(app_info_)->UpdateIcon(shortcut_info_.favicon);
   } else {
     FetchIcon();
   }
 }