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.
 // 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"
@@ skipping 38 matching lines @@
                                      AutocompleteEditModel* edit_model,
                                      views::View* location_bar);
   virtual ~TouchAutocompletePopupContentsView();
 
   // AutocompletePopupContentsView:
   virtual void UpdatePopupAppearance() OVERRIDE;
   virtual void LayoutChildren() OVERRIDE;
 
  protected:
   // AutocompletePopupContentsView:
-  virtual void PaintResultViews(gfx::CanvasSkia* canvas) OVERRIDE;
+  virtual void PaintResultViews(gfx::Canvas* canvas) OVERRIDE;
   virtual int CalculatePopupHeight() OVERRIDE;
   virtual AutocompleteResultView* CreateResultView(
       AutocompleteResultViewModel* model,
       int model_index,
       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_