| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ | 5 #ifndef COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ |
| 6 #define COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ | 6 #define COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "components/test_runner/mock_screen_orientation_client.h" | 9 #include "components/test_runner/mock_screen_orientation_client.h" |
| 10 #include "components/test_runner/web_test_delegate.h" | 10 #include "components/test_runner/web_test_delegate.h" |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 ->TestRunner() | 172 ->TestRunner() |
| 173 ->ShouldStayOnPageAfterHandlingBeforeUnload(); | 173 ->ShouldStayOnPageAfterHandlingBeforeUnload(); |
| 174 } | 174 } |
| 175 | 175 |
| 176 virtual void showContextMenu( | 176 virtual void showContextMenu( |
| 177 const blink::WebContextMenuData& context_menu_data) { | 177 const blink::WebContextMenuData& context_menu_data) { |
| 178 base_proxy_->ShowContextMenu(context_menu_data); | 178 base_proxy_->ShowContextMenu(context_menu_data); |
| 179 Base::showContextMenu(context_menu_data); | 179 Base::showContextMenu(context_menu_data); |
| 180 } | 180 } |
| 181 | 181 |
| 182 virtual void didDetectXSS(blink::WebLocalFrame* frame, | 182 virtual void didDetectXSS(const blink::WebURL& insecure_url, |
| 183 const blink::WebURL& insecure_url, | |
| 184 bool did_block_entire_page) { | 183 bool did_block_entire_page) { |
| 185 // This is not implemented in RenderFrameImpl, so need to explicitly call | 184 // This is not implemented in RenderFrameImpl, so need to explicitly call |
| 186 // into the base proxy. | 185 // into the base proxy. |
| 187 base_proxy_->DidDetectXSS(frame, insecure_url, did_block_entire_page); | 186 base_proxy_->DidDetectXSS(insecure_url, did_block_entire_page); |
| 188 Base::didDetectXSS(frame, insecure_url, did_block_entire_page); | 187 Base::didDetectXSS(insecure_url, did_block_entire_page); |
| 189 } | 188 } |
| 190 | 189 |
| 191 virtual void didDispatchPingLoader(blink::WebLocalFrame* frame, | 190 virtual void didDispatchPingLoader(blink::WebLocalFrame* frame, |
| 192 const blink::WebURL& url) { | 191 const blink::WebURL& url) { |
| 193 // This is not implemented in RenderFrameImpl, so need to explicitly call | 192 // This is not implemented in RenderFrameImpl, so need to explicitly call |
| 194 // into the base proxy. | 193 // into the base proxy. |
| 195 base_proxy_->DidDispatchPingLoader(frame, url); | 194 base_proxy_->DidDispatchPingLoader(frame, url); |
| 196 Base::didDispatchPingLoader(frame, url); | 195 Base::didDispatchPingLoader(frame, url); |
| 197 } | 196 } |
| 198 | 197 |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 280 | 279 |
| 281 private: | 280 private: |
| 282 WebTestProxyBase* base_proxy_; | 281 WebTestProxyBase* base_proxy_; |
| 283 | 282 |
| 284 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); | 283 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); |
| 285 }; | 284 }; |
| 286 | 285 |
| 287 } // namespace test_runner | 286 } // namespace test_runner |
| 288 | 287 |
| 289 #endif // COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ | 288 #endif // COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ |
| OLD | NEW |