Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1068)

Unified Diff: chrome/browser/ui/views/frame/opaque_browser_frame_view.h

Issue 9562038: ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixes Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.h
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.h b/chrome/browser/ui/views/frame/opaque_browser_frame_view.h
index 07d1bbf79de60ca71655f87e0533feb77c948851..79322dc0598689e80d9dccdc9bf318941975ff32 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.h
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.h
@@ -75,7 +75,7 @@ class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
virtual void UpdateWindowIcon() OVERRIDE;
// Overridden from views::View:
- virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
+ virtual void OnPaint(gfx::CanvasSkia* canvas) OVERRIDE;
virtual void Layout() OVERRIDE;
virtual bool HitTest(const gfx::Point& l) const OVERRIDE;
virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
@@ -135,11 +135,11 @@ class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
// Paint various sub-components of this view. The *FrameBorder() functions
// also paint the background of the titlebar area, since the top frame border
// and titlebar background are a contiguous component.
- void PaintRestoredFrameBorder(gfx::Canvas* canvas);
- void PaintMaximizedFrameBorder(gfx::Canvas* canvas);
- void PaintTitleBar(gfx::Canvas* canvas);
- void PaintToolbarBackground(gfx::Canvas* canvas);
- void PaintRestoredClientEdge(gfx::Canvas* canvas);
+ void PaintRestoredFrameBorder(gfx::CanvasSkia* canvas);
+ void PaintMaximizedFrameBorder(gfx::CanvasSkia* canvas);
+ void PaintTitleBar(gfx::CanvasSkia* canvas);
+ void PaintToolbarBackground(gfx::CanvasSkia* canvas);
+ void PaintRestoredClientEdge(gfx::CanvasSkia* canvas);
// Compute aspects of the frame needed to paint the frame background.
SkColor GetFrameColor() const;

Powered by Google App Engine
This is Rietveld 408576698