Revert 50784 - Canvas refactoring part 3....

views/controls/tabbed_pane/native_tabbed_pane_win.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 "views/controls/tabbed_pane/native_tabbed_pane_win.h"
 
 #include <vssym32.h>
 
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
-#include "gfx/canvas_skia.h"
+#include "gfx/canvas.h"
 #include "gfx/font.h"
 #include "gfx/native_theme_win.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
 #include "views/fill_layout.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget_win.h"
 
 namespace views {
 
 // A background object that paints the tab panel background which may be
 // rendered by the system visual styles system.
 class TabBackground : public Background {
  public:
   explicit TabBackground() {
     // TMT_FILLCOLORHINT returns a color value that supposedly
     // approximates the texture drawn by PaintTabPanelBackground.
     SkColor tab_page_color =
         gfx::NativeTheme::instance()->GetThemeColorWithDefault(
             gfx::NativeTheme::TAB, TABP_BODY, 0, TMT_FILLCOLORHINT,
             COLOR_3DFACE);
     SetNativeControlColor(tab_page_color);
   }
   virtual ~TabBackground() {}
 
   virtual void Paint(gfx::Canvas* canvas, View* view) const {
-    HDC dc = canvas->AsCanvasSkia()->beginPlatformPaint();
+    HDC dc = canvas->beginPlatformPaint();
     RECT r = {0, 0, view->width(), view->height()};
     gfx::NativeTheme::instance()->PaintTabPanelBackground(dc, &r);
-    canvas->AsCanvasSkia()->endPlatformPaint();
+    canvas->endPlatformPaint();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TabBackground);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTabbedPaneWin, public:
 
 NativeTabbedPaneWin::NativeTabbedPaneWin(TabbedPane* tabbed_pane)
@@ skipping 273 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTabbedPaneWrapper, public:
 
 // static
 NativeTabbedPaneWrapper* NativeTabbedPaneWrapper::CreateNativeWrapper(
     TabbedPane* tabbed_pane) {
   return new NativeTabbedPaneWin(tabbed_pane);
 }
 
 }  // namespace views