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

Side by Side Diff: Source/web/WebLocalFrameImpl.cpp

Issue 752303003: Remove WebViewClient::speechRecognizer(). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@speech_recognition
Patch Set: 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 unified diff | Download patch
« no previous file with comments | « no previous file | public/web/WebViewClient.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 #include "public/web/WebInputElement.h" 188 #include "public/web/WebInputElement.h"
189 #include "public/web/WebNode.h" 189 #include "public/web/WebNode.h"
190 #include "public/web/WebPerformance.h" 190 #include "public/web/WebPerformance.h"
191 #include "public/web/WebPlugin.h" 191 #include "public/web/WebPlugin.h"
192 #include "public/web/WebPrintParams.h" 192 #include "public/web/WebPrintParams.h"
193 #include "public/web/WebPrintPresetOptions.h" 193 #include "public/web/WebPrintPresetOptions.h"
194 #include "public/web/WebRange.h" 194 #include "public/web/WebRange.h"
195 #include "public/web/WebScriptSource.h" 195 #include "public/web/WebScriptSource.h"
196 #include "public/web/WebSecurityOrigin.h" 196 #include "public/web/WebSecurityOrigin.h"
197 #include "public/web/WebSerializedScriptValue.h" 197 #include "public/web/WebSerializedScriptValue.h"
198 #include "public/web/WebViewClient.h"
199 #include "web/AssociatedURLLoader.h" 198 #include "web/AssociatedURLLoader.h"
200 #include "web/CompositionUnderlineVectorBuilder.h" 199 #include "web/CompositionUnderlineVectorBuilder.h"
201 #include "web/FindInPageCoordinates.h" 200 #include "web/FindInPageCoordinates.h"
202 #include "web/GeolocationClientProxy.h" 201 #include "web/GeolocationClientProxy.h"
203 #include "web/LocalFileSystemClient.h" 202 #include "web/LocalFileSystemClient.h"
204 #include "web/MIDIClientProxy.h" 203 #include "web/MIDIClientProxy.h"
205 #include "web/NotificationPermissionClientImpl.h" 204 #include "web/NotificationPermissionClientImpl.h"
206 #include "web/PageOverlay.h" 205 #include "web/PageOverlay.h"
207 #include "web/SharedWorkerRepositoryClientImpl.h" 206 #include "web/SharedWorkerRepositoryClientImpl.h"
208 #include "web/SpeechRecognitionClientProxy.h" 207 #include "web/SpeechRecognitionClientProxy.h"
(...skipping 1387 matching lines...) Expand 10 before | Expand all | Expand 10 after
1596 if (m_frame) { 1595 if (m_frame) {
1597 if (m_client) 1596 if (m_client)
1598 providePushControllerTo(*m_frame, m_client->pushClient()); 1597 providePushControllerTo(*m_frame, m_client->pushClient());
1599 1598
1600 provideNotificationPermissionClientTo(*m_frame, NotificationPermissionCl ientImpl::create()); 1599 provideNotificationPermissionClientTo(*m_frame, NotificationPermissionCl ientImpl::create());
1601 provideUserMediaTo(*m_frame, &m_userMediaClientImpl); 1600 provideUserMediaTo(*m_frame, &m_userMediaClientImpl);
1602 provideGeolocationTo(*m_frame, m_geolocationClientProxy.get()); 1601 provideGeolocationTo(*m_frame, m_geolocationClientProxy.get());
1603 m_geolocationClientProxy->setController(GeolocationController::from(m_fr ame.get())); 1602 m_geolocationClientProxy->setController(GeolocationController::from(m_fr ame.get()));
1604 provideMIDITo(*m_frame, MIDIClientProxy::create(m_client ? m_client->web MIDIClient() : nullptr)); 1603 provideMIDITo(*m_frame, MIDIClientProxy::create(m_client ? m_client->web MIDIClient() : nullptr));
1605 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create()); 1604 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create());
1606 // FIXME: using WebViewClient as a temporary measure if there is no clie nt on the WebFrame. 1605 SpeechRecognitionController::provideTo(*m_frame, SpeechRecognitionClient Proxy::create(m_client ? m_client->speechRecognizer() : nullptr));
1607 if (m_client && m_client->speechRecognizer())
1608 SpeechRecognitionController::provideTo(*m_frame, SpeechRecognitionCl ientProxy::create(m_client->speechRecognizer()));
1609 else
1610 SpeechRecognitionController::provideTo(*m_frame, SpeechRecognitionCl ientProxy::create(viewImpl()->client() ? viewImpl()->client()->speechRecognizer( ) : nullptr));
1611 1606
1612 if (RuntimeEnabledFeatures::screenOrientationEnabled()) 1607 if (RuntimeEnabledFeatures::screenOrientationEnabled())
1613 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client ->webScreenOrientationClient() : nullptr); 1608 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client ->webScreenOrientationClient() : nullptr);
1614 } 1609 }
1615 } 1610 }
1616 1611
1617 PassRefPtrWillBeRawPtr<LocalFrame> WebLocalFrameImpl::initializeCoreFrame(FrameH ost* host, FrameOwner* owner, const AtomicString& name, const AtomicString& fall backName) 1612 PassRefPtrWillBeRawPtr<LocalFrame> WebLocalFrameImpl::initializeCoreFrame(FrameH ost* host, FrameOwner* owner, const AtomicString& name, const AtomicString& fall backName)
1618 { 1613 {
1619 RefPtrWillBeRawPtr<LocalFrame> frame = LocalFrame::create(&m_frameLoaderClie ntImpl, host, owner); 1614 RefPtrWillBeRawPtr<LocalFrame> frame = LocalFrame::create(&m_frameLoaderClie ntImpl, host, owner);
1620 setCoreFrame(frame); 1615 setCoreFrame(frame);
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after
1995 1990
1996 void WebLocalFrameImpl::invalidateAll() const 1991 void WebLocalFrameImpl::invalidateAll() const
1997 { 1992 {
1998 ASSERT(frame() && frame()->view()); 1993 ASSERT(frame() && frame()->view());
1999 FrameView* view = frame()->view(); 1994 FrameView* view = frame()->view();
2000 view->invalidateRect(view->frameRect()); 1995 view->invalidateRect(view->frameRect());
2001 invalidateScrollbar(); 1996 invalidateScrollbar();
2002 } 1997 }
2003 1998
2004 } // namespace blink 1999 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | public/web/WebViewClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698