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

chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_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_UI_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_
 #pragma once
 
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
@@ skipping 69 matching lines @@
 
   // Calculates the height needed to show all the results in the model.
   virtual int CalculatePopupHeight();
   virtual AutocompleteResultView* CreateResultView(
       AutocompleteResultViewModel* model,
       int model_index,
       const gfx::Font& font,
       const gfx::Font& bold_font);
 
   // Overridden from views::View:
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
+  virtual void OnPaint(gfx::CanvasSkia* canvas) OVERRIDE;
   // This method should not be triggered directly as we paint our children
   // in an un-conventional way inside OnPaint. We use a separate canvas to
   // paint the children. Hence we override this method to a no-op so that
   // the view hierarchy does not "accidentally" trigger this.
-  virtual void PaintChildren(gfx::Canvas* canvas) OVERRIDE;
+  virtual void PaintChildren(gfx::CanvasSkia* canvas) OVERRIDE;
 
   scoped_ptr<AutocompletePopupModel> model_;
 
   // The "Opt-in to Instant" promo view, if there is one.
   views::View* opt_in_view_;
 
  private:
   class AutocompletePopupWidget;
   class InstantOptInView;
 
   // Returns true if the model has a match at the specified index.
   bool HasMatchAt(size_t index) const;
 
   // Returns the match at the specified index within the popup model.
   const AutocompleteMatch& GetMatchAtIndex(size_t index) const;
 
   // Fill a path for the contents' roundrect. |bounding_rect| is the rect that
   // bounds the path.
   void MakeContentsPath(gfx::Path* path, const gfx::Rect& bounding_rect);
 
   // Updates the window's blur region for the current size.
   void UpdateBlurRegion();
 
   // Makes the contents of the canvas slightly transparent.
-  void MakeCanvasTransparent(gfx::Canvas* canvas);
+  void MakeCanvasTransparent(gfx::CanvasSkia* canvas);
 
   // Called when the line at the specified index should be opened with the
   // provided disposition.
   void OpenIndex(size_t index, WindowOpenDisposition disposition);
 
   // Find the index of the match under the given |point|, specified in window
   // coordinates. Returns AutocompletePopupModel::kNoMatch if there isn't a
   // match at the specified point.
   size_t GetIndexForPoint(const gfx::Point& point);
 
@@ skipping 39 matching lines @@
   // The popup sizes vertically using an animation when the popup is getting
   // shorter (not larger, that makes it look "slow").
   ui::SlideAnimation size_animation_;
   gfx::Rect start_bounds_;
   gfx::Rect target_bounds_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompletePopupContentsView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_