From 94a0d258287787cf09854492ce889eb14273c059 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Fri, 9 Mar 2012 00:30:59 +0000 Subject: ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia. The final goal is to merge these two classes into a single gfx::Canvas class. BUG=116572 R=ben@chromium.org,asvitkine@chromium.org TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/9562038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125735 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/views/widget/native_widget_win.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ui/views/widget/native_widget_win.h') diff --git a/ui/views/widget/native_widget_win.h b/ui/views/widget/native_widget_win.h index 6b6fea1..fe9eae3 100644 --- a/ui/views/widget/native_widget_win.h +++ b/ui/views/widget/native_widget_win.h @@ -32,7 +32,7 @@ class ViewProp; } namespace gfx { -class CanvasSkia; +class Canvas; class Font; class Rect; } @@ -551,7 +551,7 @@ class VIEWS_EXPORT NativeWidgetWin : public ui::WindowImpl, // A canvas that contains the window contents in the case of a layered // window. - scoped_ptr layered_window_contents_; + scoped_ptr layered_window_contents_; // We must track the invalid rect ourselves, for two reasons: // For layered windows, Windows will not do this properly with -- cgit v1.1