| 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 425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 436 virtual void didChangeResourcePriority(blink::WebFrame* frame, unsigned iden
tifier, const blink::WebURLRequest::Priority& priority) | 436 virtual void didChangeResourcePriority(blink::WebFrame* frame, unsigned iden
tifier, const blink::WebURLRequest::Priority& priority) |
| 437 { | 437 { |
| 438 WebTestProxyBase::didChangeResourcePriority(frame, identifier, priority)
; | 438 WebTestProxyBase::didChangeResourcePriority(frame, identifier, priority)
; |
| 439 Base::didChangeResourcePriority(frame, identifier, priority); | 439 Base::didChangeResourcePriority(frame, identifier, priority); |
| 440 } | 440 } |
| 441 virtual void didFinishResourceLoad(blink::WebFrame* frame, unsigned identifi
er) | 441 virtual void didFinishResourceLoad(blink::WebFrame* frame, unsigned identifi
er) |
| 442 { | 442 { |
| 443 WebTestProxyBase::didFinishResourceLoad(frame, identifier); | 443 WebTestProxyBase::didFinishResourceLoad(frame, identifier); |
| 444 Base::didFinishResourceLoad(frame, identifier); | 444 Base::didFinishResourceLoad(frame, identifier); |
| 445 } | 445 } |
| 446 virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message,
const blink::WebString& sourceName, unsigned sourceLine, const blink::WebString
& stackTrace) | |
| 447 { | |
| 448 WebTestProxyBase::didAddMessageToConsole(message, sourceName, sourceLine
); | |
| 449 Base::didAddMessageToConsole(message, sourceName, sourceLine, stackTrace
); | |
| 450 } | |
| 451 virtual void runModalAlertDialog(blink::WebFrame* frame, const blink::WebStr
ing& message) | 446 virtual void runModalAlertDialog(blink::WebFrame* frame, const blink::WebStr
ing& message) |
| 452 { | 447 { |
| 453 WebTestProxyBase::runModalAlertDialog(frame, message); | 448 WebTestProxyBase::runModalAlertDialog(frame, message); |
| 454 Base::runModalAlertDialog(frame, message); | 449 Base::runModalAlertDialog(frame, message); |
| 455 } | 450 } |
| 456 virtual bool runModalConfirmDialog(blink::WebFrame* frame, const blink::WebS
tring& message) | 451 virtual bool runModalConfirmDialog(blink::WebFrame* frame, const blink::WebS
tring& message) |
| 457 { | 452 { |
| 458 WebTestProxyBase::runModalConfirmDialog(frame, message); | 453 WebTestProxyBase::runModalConfirmDialog(frame, message); |
| 459 return Base::runModalConfirmDialog(frame, message); | 454 return Base::runModalConfirmDialog(frame, message); |
| 460 } | 455 } |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 502 WebTestProxyBase::postSpellCheckEvent(eventName); | 497 WebTestProxyBase::postSpellCheckEvent(eventName); |
| 503 } | 498 } |
| 504 | 499 |
| 505 private: | 500 private: |
| 506 DISALLOW_COPY_AND_ASSIGN(WebTestProxy); | 501 DISALLOW_COPY_AND_ASSIGN(WebTestProxy); |
| 507 }; | 502 }; |
| 508 | 503 |
| 509 } | 504 } |
| 510 | 505 |
| 511 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_ | 506 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_ |
| OLD | NEW |