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

chrome/browser/ui/views/autocomplete/touch_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_TOUCH_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_AUTOCOMPLETE_TOUCH_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h"
 #include "chrome/browser/ui/views/autocomplete/autocomplete_result_view.h"
 
 class AutocompleteEditModel;
 class OmniboxView;
 
 namespace gfx {
-class Canvas;
 class CanvasSkia;
 }
 
 namespace views {
 class View;
 }
 
 class TouchAutocompleteResultView : public AutocompleteResultView {
  public:
   TouchAutocompleteResultView(AutocompleteResultViewModel* model,
                               int model_index,
                               const gfx::Font& font,
                               const gfx::Font& bold_font);
 
  private:
   virtual ~TouchAutocompleteResultView();
 
   // AutocompleteResultView:
-  virtual void PaintMatch(gfx::Canvas* canvas,
+  virtual void PaintMatch(gfx::CanvasSkia* canvas,
                           const AutocompleteMatch& match,
                           int x) OVERRIDE;
   virtual int GetTextHeight() const OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(TouchAutocompleteResultView);
 };
 
 class TouchAutocompletePopupContentsView
     : public AutocompletePopupContentsView {
  public:
@@ skipping 17 matching lines @@
       const gfx::Font& font,
       const gfx::Font& bold_font) OVERRIDE;
 
  private:
   std::vector<View*> GetVisibleChildren();
 
   DISALLOW_COPY_AND_ASSIGN(TouchAutocompletePopupContentsView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_AUTOCOMPLETE_TOUCH_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_