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

chrome/browser/speech/speech_input_bubble.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_SPEECH_SPEECH_INPUT_BUBBLE_H_
 #define CHROME_BROWSER_SPEECH_SPEECH_INPUT_BUBBLE_H_
 #pragma once
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
 
 class SkBitmap;
 class SkCanvas;
 
 namespace content {
 class WebContents;
 }
 
 namespace gfx {
-class Canvas;
 class Rect;
 }
 
 // SpeechInputBubble displays a popup info bubble during speech recognition,
 // points to the html element which requested speech input and shows recognition
 // progress events. The popup is closed by the user clicking anywhere outside
 // the popup window, or by the caller destroying this object.
 class SpeechInputBubble {
  public:
   // The various buttons which may be part of the bubble.
@@ skipping 155 matching lines @@
   scoped_ptr<SkBitmap> icon_image_;
 };
 
 // This typedef is to workaround the issue with certain versions of
 // Visual Studio where it gets confused between multiple Delegate
 // classes and gives a C2500 error. (I saw this error on the try bots -
 // the workaround was not needed for my machine).
 typedef SpeechInputBubble::Delegate SpeechInputBubbleDelegate;
 
 #endif  // CHROME_BROWSER_SPEECH_SPEECH_INPUT_BUBBLE_H_