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

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

Issue 264773002: Start moving WebUserMediaClient on the chromium side to be per frame instead of view. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | content/shell/renderer/webkit_test_runner.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_WEBFRAMETESTPROXY_H_ 5 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBFRAMETESTPROXY_H_
6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBFRAMETESTPROXY_H_ 6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBFRAMETESTPROXY_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "content/shell/renderer/test_runner/test_runner.h" 9 #include "content/shell/renderer/test_runner/test_runner.h"
10 #include "content/shell/renderer/test_runner/TestInterfaces.h" 10 #include "content/shell/renderer/test_runner/TestInterfaces.h"
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 if (policy == blink::WebNavigationPolicyIgnore) 195 if (policy == blink::WebNavigationPolicyIgnore)
196 return policy; 196 return policy;
197 197
198 return Base::decidePolicyForNavigation(frame, extraData, request, type, defaultPolicy, isRedirect); 198 return Base::decidePolicyForNavigation(frame, extraData, request, type, defaultPolicy, isRedirect);
199 } 199 }
200 virtual void willStartUsingPeerConnectionHandler(blink::WebLocalFrame* frame , blink::WebRTCPeerConnectionHandler* handler) 200 virtual void willStartUsingPeerConnectionHandler(blink::WebLocalFrame* frame , blink::WebRTCPeerConnectionHandler* handler)
201 { 201 {
202 // RenderFrameImpl::willStartUsingPeerConnectionHandler can not be mocke d. 202 // RenderFrameImpl::willStartUsingPeerConnectionHandler can not be mocke d.
203 // See http://crbug/363285. 203 // See http://crbug/363285.
204 } 204 }
205 virtual blink::WebUserMediaClient* userMediaClient()
206 {
207 return m_baseProxy->userMediaClient();
208 }
205 virtual bool willCheckAndDispatchMessageEvent(blink::WebLocalFrame* sourceFr ame, blink::WebFrame* targetFrame, blink::WebSecurityOrigin target, blink::WebDO MMessageEvent event) 209 virtual bool willCheckAndDispatchMessageEvent(blink::WebLocalFrame* sourceFr ame, blink::WebFrame* targetFrame, blink::WebSecurityOrigin target, blink::WebDO MMessageEvent event)
206 { 210 {
207 if (m_baseProxy->willCheckAndDispatchMessageEvent(sourceFrame, targetFra me, target, event)) 211 if (m_baseProxy->willCheckAndDispatchMessageEvent(sourceFrame, targetFra me, target, event))
208 return true; 212 return true;
209 return Base::willCheckAndDispatchMessageEvent(sourceFrame, targetFrame, target, event); 213 return Base::willCheckAndDispatchMessageEvent(sourceFrame, targetFrame, target, event);
210 } 214 }
211 virtual void didStopLoading() 215 virtual void didStopLoading()
212 { 216 {
213 m_baseProxy->didStopLoading(); 217 m_baseProxy->didStopLoading();
214 Base::didStopLoading(); 218 Base::didStopLoading();
215 } 219 }
216 220
217 private: 221 private:
218 WebTestProxyBase* m_baseProxy; 222 WebTestProxyBase* m_baseProxy;
219 223
220 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); 224 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy);
221 }; 225 };
222 226
223 } // namespace content 227 } // namespace content
224 228
225 #endif // WebTestProxy_h 229 #endif // WebTestProxy_h
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | content/shell/renderer/webkit_test_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698