Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(129)

Side by Side Diff: chrome/renderer/render_view.h

Issue 3035035: Adds chromium side plumbing to pass speech input calls back and forth with WebKit. (Closed)
Patch Set: Addressed all comments. Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_RENDERER_RENDER_VIEW_H_ 5 #ifndef CHROME_RENDERER_RENDER_VIEW_H_
6 #define CHROME_RENDERER_RENDER_VIEW_H_ 6 #define CHROME_RENDERER_RENDER_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <deque> 9 #include <deque>
10 #include <map> 10 #include <map>
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 class FilePath; 60 class FilePath;
61 class GeolocationDispatcher; 61 class GeolocationDispatcher;
62 class GURL; 62 class GURL;
63 class ListValue; 63 class ListValue;
64 class NavigationState; 64 class NavigationState;
65 class NotificationProvider; 65 class NotificationProvider;
66 class PepperDeviceTest; 66 class PepperDeviceTest;
67 class PrintWebViewHelper; 67 class PrintWebViewHelper;
68 class RenderViewVisitor; 68 class RenderViewVisitor;
69 class SkBitmap; 69 class SkBitmap;
70 class SpeechInputDispatcher;
70 class WebPluginDelegatePepper; 71 class WebPluginDelegatePepper;
71 class WebPluginDelegateProxy; 72 class WebPluginDelegateProxy;
72 struct ContextMenuMediaParams; 73 struct ContextMenuMediaParams;
73 struct ThumbnailScore; 74 struct ThumbnailScore;
74 struct ViewMsg_ClosePage_Params; 75 struct ViewMsg_ClosePage_Params;
75 struct ViewMsg_Navigate_Params; 76 struct ViewMsg_Navigate_Params;
76 struct WebDropData; 77 struct WebDropData;
77 78
78 namespace base { 79 namespace base {
79 class WaitableEvent; 80 class WaitableEvent;
(...skipping 20 matching lines...) Expand all
100 class WebDocument; 101 class WebDocument;
101 class WebDragData; 102 class WebDragData;
102 class WebGeolocationServiceInterface; 103 class WebGeolocationServiceInterface;
103 class WebImage; 104 class WebImage;
104 class WebInputElement; 105 class WebInputElement;
105 class WebKeyboardEvent; 106 class WebKeyboardEvent;
106 class WebMediaPlayer; 107 class WebMediaPlayer;
107 class WebMediaPlayerClient; 108 class WebMediaPlayerClient;
108 class WebNode; 109 class WebNode;
109 class WebPlugin; 110 class WebPlugin;
111 class WebSpeechInputController;
112 class WebSpeechInputListener;
110 class WebStorageNamespace; 113 class WebStorageNamespace;
111 class WebURLRequest; 114 class WebURLRequest;
112 class WebView; 115 class WebView;
113 struct WebContextMenuData; 116 struct WebContextMenuData;
114 struct WebFileChooserParams; 117 struct WebFileChooserParams;
115 struct WebFindOptions; 118 struct WebFindOptions;
116 struct WebPluginParams; 119 struct WebPluginParams;
117 struct WebPoint; 120 struct WebPoint;
118 struct WebWindowFeatures; 121 struct WebWindowFeatures;
119 } 122 }
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 int unique_id, 409 int unique_id,
407 unsigned index); 410 unsigned index);
408 virtual void didSelectAutoFillSuggestion(const WebKit::WebNode& node, 411 virtual void didSelectAutoFillSuggestion(const WebKit::WebNode& node,
409 const WebKit::WebString& value, 412 const WebKit::WebString& value,
410 const WebKit::WebString& label, 413 const WebKit::WebString& label,
411 int unique_id); 414 int unique_id);
412 virtual void didClearAutoFillSelection(const WebKit::WebNode& node); 415 virtual void didClearAutoFillSelection(const WebKit::WebNode& node);
413 virtual void didAcceptAutocompleteSuggestion( 416 virtual void didAcceptAutocompleteSuggestion(
414 const WebKit::WebInputElement& element); 417 const WebKit::WebInputElement& element);
415 virtual WebKit::WebGeolocationService* geolocationService(); 418 virtual WebKit::WebGeolocationService* geolocationService();
419 virtual WebKit::WebSpeechInputController* speechInputController(
420 WebKit::WebSpeechInputListener* listener);
416 421
417 // WebKit::WebFrameClient implementation ------------------------------------- 422 // WebKit::WebFrameClient implementation -------------------------------------
418 423
419 virtual WebKit::WebPlugin* createPlugin( 424 virtual WebKit::WebPlugin* createPlugin(
420 WebKit::WebFrame* frame, 425 WebKit::WebFrame* frame,
421 const WebKit::WebPluginParams& params); 426 const WebKit::WebPluginParams& params);
422 virtual WebKit::WebWorker* createWorker(WebKit::WebFrame* frame, 427 virtual WebKit::WebWorker* createWorker(WebKit::WebFrame* frame,
423 WebKit::WebWorkerClient* client); 428 WebKit::WebWorkerClient* client);
424 virtual WebKit::WebSharedWorker* createSharedWorker( 429 virtual WebKit::WebSharedWorker* createSharedWorker(
425 WebKit::WebFrame* frame, const WebKit::WebURL& url, 430 WebKit::WebFrame* frame, const WebKit::WebURL& url,
(...skipping 773 matching lines...) Expand 10 before | Expand all | Expand 10 after
1199 1204
1200 scoped_refptr<AudioMessageFilter> audio_message_filter_; 1205 scoped_refptr<AudioMessageFilter> audio_message_filter_;
1201 1206
1202 // The geolocation dispatcher attached to this view, lazily initialized. 1207 // The geolocation dispatcher attached to this view, lazily initialized.
1203 scoped_ptr<GeolocationDispatcher> geolocation_dispatcher_; 1208 scoped_ptr<GeolocationDispatcher> geolocation_dispatcher_;
1204 1209
1205 // Handles accessibility requests into the renderer side, as well as 1210 // Handles accessibility requests into the renderer side, as well as
1206 // maintains the cache and other features of the accessibility tree. 1211 // maintains the cache and other features of the accessibility tree.
1207 scoped_ptr<WebKit::WebAccessibilityCache> accessibility_; 1212 scoped_ptr<WebKit::WebAccessibilityCache> accessibility_;
1208 1213
1214 // The speech dispatcher attached to this view, lazily initialized.
1215 scoped_ptr<SpeechInputDispatcher> speech_input_dispatcher_;
1216
1209 // Misc ---------------------------------------------------------------------- 1217 // Misc ----------------------------------------------------------------------
1210 1218
1211 // The current and pending file chooser completion objects. If the queue is 1219 // The current and pending file chooser completion objects. If the queue is
1212 // nonempty, the first item represents the currently running file chooser 1220 // nonempty, the first item represents the currently running file chooser
1213 // callback, and the remaining elements are the other file chooser completion 1221 // callback, and the remaining elements are the other file chooser completion
1214 // still waiting to be run (in order). 1222 // still waiting to be run (in order).
1215 struct PendingFileChooser; 1223 struct PendingFileChooser;
1216 std::deque< linked_ptr<PendingFileChooser> > file_chooser_completions_; 1224 std::deque< linked_ptr<PendingFileChooser> > file_chooser_completions_;
1217 1225
1218 // Resource message queue. Used to queue up resource IPCs if we need 1226 // Resource message queue. Used to queue up resource IPCs if we need
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
1265 // ADDING NEW DATA? Please see if it fits appropriately in one of the above 1273 // ADDING NEW DATA? Please see if it fits appropriately in one of the above
1266 // sections rather than throwing it randomly at the end. If you're adding a 1274 // sections rather than throwing it randomly at the end. If you're adding a
1267 // bunch of stuff, you should probably create a helper class and put your 1275 // bunch of stuff, you should probably create a helper class and put your
1268 // data and methods on that to avoid bloating RenderView more. 1276 // data and methods on that to avoid bloating RenderView more.
1269 // --------------------------------------------------------------------------- 1277 // ---------------------------------------------------------------------------
1270 1278
1271 DISALLOW_COPY_AND_ASSIGN(RenderView); 1279 DISALLOW_COPY_AND_ASSIGN(RenderView);
1272 }; 1280 };
1273 1281
1274 #endif // CHROME_RENDERER_RENDER_VIEW_H_ 1282 #endif // CHROME_RENDERER_RENDER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698