OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CHROME_BROWSER_SPEECH_SPEECH_RECOGNITION_BUBBLE_H_ | 5 #ifndef CHROME_BROWSER_SPEECH_SPEECH_RECOGNITION_BUBBLE_H_ |
6 #define CHROME_BROWSER_SPEECH_SPEECH_RECOGNITION_BUBBLE_H_ | 6 #define CHROME_BROWSER_SPEECH_SPEECH_RECOGNITION_BUBBLE_H_ |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
11 #include "base/memory/weak_ptr.h" | 11 #include "base/memory/weak_ptr.h" |
12 #include "base/string16.h" | 12 #include "base/strings/string16.h" |
13 #include "ui/base/layout.h" | 13 #include "ui/base/layout.h" |
14 #include "ui/gfx/image/image_skia.h" | 14 #include "ui/gfx/image/image_skia.h" |
15 | 15 |
16 class SkBitmap; | 16 class SkBitmap; |
17 class SkCanvas; | 17 class SkCanvas; |
18 | 18 |
19 namespace content { | 19 namespace content { |
20 class WebContents; | 20 class WebContents; |
21 } | 21 } |
22 | 22 |
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
189 DISALLOW_COPY_AND_ASSIGN(SpeechRecognitionBubbleBase); | 189 DISALLOW_COPY_AND_ASSIGN(SpeechRecognitionBubbleBase); |
190 }; | 190 }; |
191 | 191 |
192 // This typedef is to workaround the issue with certain versions of | 192 // This typedef is to workaround the issue with certain versions of |
193 // Visual Studio where it gets confused between multiple Delegate | 193 // Visual Studio where it gets confused between multiple Delegate |
194 // classes and gives a C2500 error. (I saw this error on the try bots - | 194 // classes and gives a C2500 error. (I saw this error on the try bots - |
195 // the workaround was not needed for my machine). | 195 // the workaround was not needed for my machine). |
196 typedef SpeechRecognitionBubble::Delegate SpeechRecognitionBubbleDelegate; | 196 typedef SpeechRecognitionBubble::Delegate SpeechRecognitionBubbleDelegate; |
197 | 197 |
198 #endif // CHROME_BROWSER_SPEECH_SPEECH_RECOGNITION_BUBBLE_H_ | 198 #endif // CHROME_BROWSER_SPEECH_SPEECH_RECOGNITION_BUBBLE_H_ |
OLD | NEW |