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

Unified Diff: Source/web/WebLocalFrameImpl.cpp

Issue 863213002: Revert of Make SpeechRecognitionController per frame instead of per page. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/modules/speech/SpeechRecognitionController.cpp ('k') | Source/web/WebViewImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebLocalFrameImpl.cpp
diff --git a/Source/web/WebLocalFrameImpl.cpp b/Source/web/WebLocalFrameImpl.cpp
index d6cd98afcfc33851aceab31721cd85945b931fba..163cbeb54f58fe26c2f05419be881928eefd4f1f 100644
--- a/Source/web/WebLocalFrameImpl.cpp
+++ b/Source/web/WebLocalFrameImpl.cpp
@@ -152,7 +152,6 @@
#include "modules/notifications/NotificationPermissionClient.h"
#include "modules/push_messaging/PushController.h"
#include "modules/screen_orientation/ScreenOrientationController.h"
-#include "modules/speech/SpeechRecognitionController.h"
#include "platform/ScriptForbiddenScope.h"
#include "platform/TraceEvent.h"
#include "platform/UserGestureIndicator.h"
@@ -196,7 +195,6 @@
#include "public/web/WebScriptSource.h"
#include "public/web/WebSecurityOrigin.h"
#include "public/web/WebSerializedScriptValue.h"
-#include "public/web/WebViewClient.h"
#include "web/AssociatedURLLoader.h"
#include "web/CompositionUnderlineVectorBuilder.h"
#include "web/FindInPageCoordinates.h"
@@ -206,7 +204,6 @@
#include "web/NotificationPermissionClientImpl.h"
#include "web/PageOverlay.h"
#include "web/SharedWorkerRepositoryClientImpl.h"
-#include "web/SpeechRecognitionClientProxy.h"
#include "web/SuspendableScriptExecutor.h"
#include "web/TextFinder.h"
#include "web/WebDataSourceImpl.h"
@@ -1610,11 +1607,6 @@ void WebLocalFrameImpl::setCoreFrame(PassRefPtrWillBeRawPtr<LocalFrame> frame)
m_geolocationClientProxy->setController(GeolocationController::from(m_frame.get()));
provideMIDITo(*m_frame, MIDIClientProxy::create(m_client ? m_client->webMIDIClient() : nullptr));
provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create());
- // FIXME: using WebViewClient as a temporary measure if there is no client on the WebFrame.
- if (m_client && m_client->speechRecognizer())
- SpeechRecognitionController::provideTo(*m_frame, SpeechRecognitionClientProxy::create(m_client->speechRecognizer()));
- else
- SpeechRecognitionController::provideTo(*m_frame, SpeechRecognitionClientProxy::create(viewImpl()->client() ? viewImpl()->client()->speechRecognizer() : nullptr));
if (RuntimeEnabledFeatures::screenOrientationEnabled())
ScreenOrientationController::provideTo(*m_frame, m_client ? m_client->webScreenOrientationClient() : nullptr);
« no previous file with comments | « Source/modules/speech/SpeechRecognitionController.cpp ('k') | Source/web/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698