| OLD | NEW |
| 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 Loading... |
| 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 void showContextMenu(blink::WebFrame* frame, const blink::WebContext
MenuData& contextMenuData) | 317 virtual void showContextMenu(blink::WebFrame* frame, const blink::WebContext
MenuData& contextMenuData) |
| 318 { | 318 { |
| 319 WebTestProxyBase::showContextMenu(frame, contextMenuData); | 319 WebTestProxyBase::showContextMenu(frame, contextMenuData); |
| 320 Base::showContextMenu(frame, contextMenuData); | 320 Base::showContextMenu(frame, contextMenuData); |
| 321 } | 321 } |
| 322 virtual blink::WebUserMediaClient* userMediaClient() | 322 virtual blink::WebUserMediaClient* userMediaClient() |
| 323 { | 323 { |
| 324 return WebTestProxyBase::userMediaClient(); | 324 return WebTestProxyBase::userMediaClient(); |
| 325 } | 325 } |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 524 WebTestProxyBase::postSpellCheckEvent(eventName); | 524 WebTestProxyBase::postSpellCheckEvent(eventName); |
| 525 } | 525 } |
| 526 | 526 |
| 527 private: | 527 private: |
| 528 DISALLOW_COPY_AND_ASSIGN(WebTestProxy); | 528 DISALLOW_COPY_AND_ASSIGN(WebTestProxy); |
| 529 }; | 529 }; |
| 530 | 530 |
| 531 } | 531 } |
| 532 | 532 |
| 533 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_ | 533 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_ |
| OLD | NEW |