content/shell/renderer/test_runner/web_frame_test_proxy.h - Issue 636863003: Make SpeechRecognition per RenderFrame instead of per RenderView.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/shell/renderer/test_runner/web_frame_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 6 years 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 side-by-side diff with in-line comments

Download patch

« content/browser/web_contents/web_contents_impl.h ('K') | « content/renderer/speech_recognition_dispatcher.cc ('k') | content/shell/renderer/test_runner/web_test_proxy.h » ('j') | extensions/shell/browser/shell_speech_recognition_manager_delegate.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/renderer/test_runner/web_frame_test_proxy.h

diff --git a/content/shell/renderer/test_runner/web_frame_test_proxy.h b/content/shell/renderer/test_runner/web_frame_test_proxy.h

index b02bb5799978886731f72b42d6cd04b3dcd57056..22c74ac82aa3599f486ab8a67792bf0593a85269 100644

--- a/content/shell/renderer/test_runner/web_frame_test_proxy.h

+++ b/content/shell/renderer/test_runner/web_frame_test_proxy.h

@@ -7,6 +7,7 @@

#include "base/basictypes.h"

#include "content/shell/renderer/test_runner/mock_screen_orientation_client.h"

+#include "content/shell/renderer/test_runner/mock_web_speech_recognizer.h"

#include "content/shell/renderer/test_runner/test_interfaces.h"

#include "content/shell/renderer/test_runner/test_runner.h"

#include "content/shell/renderer/test_runner/web_test_delegate.h"

@@ -40,6 +41,10 @@ class WebFrameTestProxy : public Base {

return base_proxy_->GetScreenOrientationClientMock();

}

+ virtual blink::WebSpeechRecognizer* speechRecognizer() {

+ return base_proxy_->GetSpeechRecognizerMock();

+ }

virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message,

const blink::WebString& source_name,

unsigned source_line,