Revert 50784 - Canvas refactoring part 3....

chrome/browser/views/tabs/dragged_tab_controller.cc

 // Copyright (c) 2010 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/tabs/dragged_tab_controller.h"
 
 #include <math.h>
 #include <set>
 
 #include "app/animation.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/views/tabs/base_tab.h"
 #include "chrome/browser/views/tabs/base_tab_strip.h"
 #include "chrome/browser/views/tabs/browser_tab_strip_controller.h"
 #include "chrome/browser/views/tabs/dragged_tab_view.h"
 #include "chrome/browser/views/tabs/native_view_photobooth.h"
 #include "chrome/browser/views/tabs/side_tab.h"
 #include "chrome/browser/views/tabs/side_tab_strip.h"
 #include "chrome/browser/views/tabs/tab.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
 #include "chrome/common/notification_service.h"
-#include "gfx/canvas_skia.h"
+#include "gfx/canvas.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "views/event.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
 #if defined(OS_WIN)
 #include "views/widget/widget_win.h"
 #endif
@@ skipping 34 matching lines @@
 
   virtual void PaintBackground(gfx::Canvas* canvas) {
     SkRect outer_rect = { SkIntToScalar(0), SkIntToScalar(0),
                           SkIntToScalar(width()),
                           SkIntToScalar(height()) };
 
     // Fill the background rect.
     SkPaint paint;
     paint.setColor(SkColorSetRGB(108, 108, 108));
     paint.setStyle(SkPaint::kFill_Style);
-    canvas->AsCanvasSkia()->drawRoundRect(
-        outer_rect, SkIntToScalar(kRoundedRectRadius),
-        SkIntToScalar(kRoundedRectRadius), paint);
+    canvas->drawRoundRect(outer_rect, SkIntToScalar(kRoundedRectRadius),
+                          SkIntToScalar(kRoundedRectRadius), paint);
 
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
     SkBitmap* high_icon = rb.GetBitmapNamed(IDR_DOCK_HIGH);
     SkBitmap* wide_icon = rb.GetBitmapNamed(IDR_DOCK_WIDE);
 
     bool rtl_ui = base::i18n::IsRTL();
     if (rtl_ui) {
       // Flip canvas to draw the mirrored tab images for RTL UI.
-      canvas->AsCanvasSkia()->save();
+      canvas->save();
       canvas->TranslateInt(width(), 0);
       canvas->ScaleInt(-1, 1);
     }
     int x_of_active_tab = -1;
     int x_of_inactive_tab = -1;
     switch (type_) {
       case DockInfo::LEFT_OF_WINDOW:
       case DockInfo::LEFT_HALF:
         if (!rtl_ui) {
           x_of_active_tab = width() / 2 - high_icon->width() - kTabSpacing / 2;
@@ skipping 53 matching lines @@
               (width() - wide_icon->width()) / 2,
               height() / 2 - kTabSpacing / 2 - wide_icon->height());
         }
         break;
 
       default:
         NOTREACHED();
         break;
     }
     if (rtl_ui)
-      canvas->AsCanvasSkia()->restore();
+      canvas->restore();
   }
 
  private:
   void DrawBitmapWithAlpha(gfx::Canvas* canvas, const SkBitmap& image,
                            int x, int y) {
     SkPaint paint;
     paint.setAlpha(128);
     canvas->DrawBitmapInt(image, x, y, paint);
   }
 
@@ skipping 1142 matching lines @@
 #else
     NOTIMPLEMENTED();
 #endif
   }
 }
 
 TabStripModel* DraggedTabController::GetModel(BaseTabStrip* tabstrip) const {
   return static_cast<BrowserTabStripController*>(tabstrip->controller())->
       model();
 }