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

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

Issue 180113003: Prepare for per frame did{Start,Stop}Loading calls (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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') | no next file » | 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_WEBTESTPROXY_H_ 5 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_
6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_ 6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 { 302 {
303 if (!WebTestProxyBase::createView(creator, request, features, frameName, policy, suppressOpener)) 303 if (!WebTestProxyBase::createView(creator, request, features, frameName, policy, suppressOpener))
304 return 0; 304 return 0;
305 return Base::createView(creator, request, features, frameName, policy, s uppressOpener); 305 return Base::createView(creator, request, features, frameName, policy, s uppressOpener);
306 } 306 }
307 virtual void setStatusText(const blink::WebString& text) 307 virtual void setStatusText(const blink::WebString& text)
308 { 308 {
309 WebTestProxyBase::setStatusText(text); 309 WebTestProxyBase::setStatusText(text);
310 Base::setStatusText(text); 310 Base::setStatusText(text);
311 } 311 }
312 virtual void didStopLoading() 312 virtual void didStopLoading(blink::WebFrame* frame)
313 { 313 {
314 WebTestProxyBase::didStopLoading(); 314 WebTestProxyBase::didStopLoading();
315 Base::didStopLoading(); 315 Base::didStopLoading(frame);
316 } 316 }
317 virtual blink::WebUserMediaClient* userMediaClient() 317 virtual blink::WebUserMediaClient* userMediaClient()
318 { 318 {
319 return WebTestProxyBase::userMediaClient(); 319 return WebTestProxyBase::userMediaClient();
320 } 320 }
321 virtual void printPage(blink::WebFrame* frame) 321 virtual void printPage(blink::WebFrame* frame)
322 { 322 {
323 WebTestProxyBase::printPage(frame); 323 WebTestProxyBase::printPage(frame);
324 } 324 }
325 virtual blink::WebNotificationPresenter* notificationPresenter() 325 virtual blink::WebNotificationPresenter* notificationPresenter()
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 WebTestProxyBase::postSpellCheckEvent(eventName); 512 WebTestProxyBase::postSpellCheckEvent(eventName);
513 } 513 }
514 514
515 private: 515 private:
516 DISALLOW_COPY_AND_ASSIGN(WebTestProxy); 516 DISALLOW_COPY_AND_ASSIGN(WebTestProxy);
517 }; 517 };
518 518
519 } 519 }
520 520
521 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_ 521 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698