Canvas refactoring part 2....

views/widget/widget_win.h

 // 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.
 
 #ifndef VIEWS_WIDGET_WIDGET_WIN_H_
 #define VIEWS_WIDGET_WIDGET_WIN_H_
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
 #include <atlmisc.h>
 
 #include <vector>
 
 #include "app/win/window_impl.h"
 #include "base/message_loop.h"
 #include "base/scoped_comptr_win.h"
 #include "views/focus/focus_manager.h"
 #include "views/layout_manager.h"
 #include "views/widget/widget.h"
 
 namespace gfx {
-class Canvas;
+class CanvasSkia;
 class Rect;
 }
 
 namespace views {
 
 class DefaultThemeProvider;
 class DropTargetWin;
 class FocusSearch;
 class RootView;
 class TooltipManagerWin;
@@ skipping 492 matching lines @@
   // must likely want to set this to false, or after changing the alpha toggle
   // the extended style bit to false than back to true. See MSDN for more
   // details.
   bool use_layered_buffer_;
 
   // The default alpha to be applied to the layered window.
   BYTE layered_alpha_;
 
   // A canvas that contains the window contents in the case of a layered
   // window.
-  scoped_ptr<gfx::Canvas> contents_;
+  scoped_ptr<gfx::CanvasSkia> contents_;
 
   // Whether or not the window should delete itself when it is destroyed.
   // Set this to false via its setter for stack allocated instances.
   bool delete_on_destroy_;
 
   // True if we are allowed to update the layered window from the DIB backing
   // store if necessary.
   bool can_update_layered_window_;
 
   // The following are used to detect duplicate mouse move events and not
@@ skipping 28 matching lines @@
   std::vector<View*> accessibility_view_events_;
 
   // The current position of the view events vector.  When incrementing,
   // we always mod this value with the max view events above .
   int accessibility_view_events_index_;
 };
 
 }  // namespace views
 
 #endif  // VIEWS_WIDGET_WIDGET_WIN_H_