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

Side by Side Diff: content/shell/renderer/test_runner/web_test_proxy.h

Issue 636863003: Make SpeechRecognition per RenderFrame instead of per RenderView. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments Created 5 years, 11 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_ 5 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_
6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_ 6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 bool suppress_opener); 162 bool suppress_opener);
163 blink::WebPlugin* CreatePlugin(blink::WebLocalFrame* frame, 163 blink::WebPlugin* CreatePlugin(blink::WebLocalFrame* frame,
164 const blink::WebPluginParams& params); 164 const blink::WebPluginParams& params);
165 void SetStatusText(const blink::WebString& text); 165 void SetStatusText(const blink::WebString& text);
166 void DidStopLoading(); 166 void DidStopLoading();
167 void ShowContextMenu(blink::WebLocalFrame* frame, 167 void ShowContextMenu(blink::WebLocalFrame* frame,
168 const blink::WebContextMenuData& data); 168 const blink::WebContextMenuData& data);
169 blink::WebUserMediaClient* GetUserMediaClient(); 169 blink::WebUserMediaClient* GetUserMediaClient();
170 void PrintPage(blink::WebLocalFrame* frame); 170 void PrintPage(blink::WebLocalFrame* frame);
171 blink::WebMIDIClient* GetWebMIDIClient(); 171 blink::WebMIDIClient* GetWebMIDIClient();
172 blink::WebSpeechRecognizer* GetSpeechRecognizer();
173 bool RequestPointerLock(); 172 bool RequestPointerLock();
174 void RequestPointerUnlock(); 173 void RequestPointerUnlock();
175 bool IsPointerLocked(); 174 bool IsPointerLocked();
176 void DidFocus(); 175 void DidFocus();
177 void DidBlur(); 176 void DidBlur();
178 void SetToolTipText(const blink::WebString& text, 177 void SetToolTipText(const blink::WebString& text,
179 blink::WebTextDirection direction); 178 blink::WebTextDirection direction);
180 void DidAddMessageToConsole(const blink::WebConsoleMessage& text, 179 void DidAddMessageToConsole(const blink::WebConsoleMessage& text,
181 const blink::WebString& source_name, 180 const blink::WebString& source_name,
182 unsigned source_line); 181 unsigned source_line);
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 return Base::createView( 333 return Base::createView(
335 creator, request, features, frame_name, policy, suppress_opener); 334 creator, request, features, frame_name, policy, suppress_opener);
336 } 335 }
337 virtual void setStatusText(const blink::WebString& text) { 336 virtual void setStatusText(const blink::WebString& text) {
338 WebTestProxyBase::SetStatusText(text); 337 WebTestProxyBase::SetStatusText(text);
339 Base::setStatusText(text); 338 Base::setStatusText(text);
340 } 339 }
341 virtual void printPage(blink::WebLocalFrame* frame) { 340 virtual void printPage(blink::WebLocalFrame* frame) {
342 WebTestProxyBase::PrintPage(frame); 341 WebTestProxyBase::PrintPage(frame);
343 } 342 }
344 virtual blink::WebSpeechRecognizer* speechRecognizer() {
345 return WebTestProxyBase::GetSpeechRecognizer();
346 }
347 virtual bool requestPointerLock() { 343 virtual bool requestPointerLock() {
348 return WebTestProxyBase::RequestPointerLock(); 344 return WebTestProxyBase::RequestPointerLock();
349 } 345 }
350 virtual void requestPointerUnlock() { 346 virtual void requestPointerUnlock() {
351 WebTestProxyBase::RequestPointerUnlock(); 347 WebTestProxyBase::RequestPointerUnlock();
352 } 348 }
353 virtual bool isPointerLocked() { return WebTestProxyBase::IsPointerLocked(); } 349 virtual bool isPointerLocked() { return WebTestProxyBase::IsPointerLocked(); }
354 virtual void didFocus() { 350 virtual void didFocus() {
355 WebTestProxyBase::DidFocus(); 351 WebTestProxyBase::DidFocus();
356 Base::didFocus(); 352 Base::didFocus();
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 388
393 private: 389 private:
394 virtual ~WebTestProxy() {} 390 virtual ~WebTestProxy() {}
395 391
396 DISALLOW_COPY_AND_ASSIGN(WebTestProxy); 392 DISALLOW_COPY_AND_ASSIGN(WebTestProxy);
397 }; 393 };
398 394
399 } // namespace content 395 } // namespace content
400 396
401 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_ 397 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_
OLDNEW
« no previous file with comments | « content/shell/renderer/test_runner/web_frame_test_proxy.h ('k') | content/shell/renderer/test_runner/web_test_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698