ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia.

chrome/browser/chromeos/frame/bubble_frame_view.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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 CHROME_BROWSER_CHROMEOS_FRAME_BUBBLE_FRAME_VIEW_H_
 #define CHROME_BROWSER_CHROMEOS_FRAME_BUBBLE_FRAME_VIEW_H_
 #pragma once
 
 #include "chrome/browser/chromeos/frame/bubble_window.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/window/non_client_view.h"
@@ skipping 30 matching lines @@
   virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
   virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask)
       OVERRIDE;
   virtual void ResetWindowControls() OVERRIDE;
   virtual void UpdateWindowIcon() OVERRIDE;
 
   // View overrides:
   virtual gfx::Insets GetInsets() const OVERRIDE;
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void Layout() OVERRIDE;
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
+  virtual void OnPaint(gfx::CanvasSkia* canvas) OVERRIDE;
 
   // Overridden from views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender, const views::Event& event)
       OVERRIDE;
 
   void StartThrobber();
   void StopThrobber();
 
  private:
   // Allows to tweak appearance of the view.
@@ skipping 10 matching lines @@
 
   // Throbber is optional. Employed by STYLE_THROBBER.
   views::Throbber* throbber_;
 
   DISALLOW_COPY_AND_ASSIGN(BubbleFrameView);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_FRAME_BUBBLE_FRAME_VIEW_H_