| 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/macros.h" | 8 #include "base/macros.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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 blink::WebHistoryCommitType commit_type) { | 127 blink::WebHistoryCommitType commit_type) { |
| 128 base_proxy_->DidFailLoad(frame, error, commit_type); | 128 base_proxy_->DidFailLoad(frame, error, commit_type); |
| 129 Base::didFailLoad(frame, error, commit_type); | 129 Base::didFailLoad(frame, error, commit_type); |
| 130 } | 130 } |
| 131 | 131 |
| 132 virtual void didFinishLoad(blink::WebLocalFrame* frame) { | 132 virtual void didFinishLoad(blink::WebLocalFrame* frame) { |
| 133 Base::didFinishLoad(frame); | 133 Base::didFinishLoad(frame); |
| 134 base_proxy_->DidFinishLoad(frame); | 134 base_proxy_->DidFinishLoad(frame); |
| 135 } | 135 } |
| 136 | 136 |
| 137 void didStopLoading(blink::WebLocalFrame* frame) override { |
| 138 Base::didStopLoading(frame); |
| 139 base_proxy_->DidStopLoading(frame); |
| 140 } |
| 141 |
| 137 virtual void didChangeSelection(bool is_selection_empty) { | 142 virtual void didChangeSelection(bool is_selection_empty) { |
| 138 base_proxy_->DidChangeSelection(is_selection_empty); | 143 base_proxy_->DidChangeSelection(is_selection_empty); |
| 139 Base::didChangeSelection(is_selection_empty); | 144 Base::didChangeSelection(is_selection_empty); |
| 140 } | 145 } |
| 141 | 146 |
| 142 virtual blink::WebColorChooser* createColorChooser( | 147 virtual blink::WebColorChooser* createColorChooser( |
| 143 blink::WebColorChooserClient* client, | 148 blink::WebColorChooserClient* client, |
| 144 const blink::WebColor& initial_color, | 149 const blink::WebColor& initial_color, |
| 145 const blink::WebVector<blink::WebColorSuggestion>& suggestions) { | 150 const blink::WebVector<blink::WebColorSuggestion>& suggestions) { |
| 146 return base_proxy_->CreateColorChooser(client, initial_color, suggestions); | 151 return base_proxy_->CreateColorChooser(client, initial_color, suggestions); |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 284 | 289 |
| 285 private: | 290 private: |
| 286 WebTestProxyBase* base_proxy_; | 291 WebTestProxyBase* base_proxy_; |
| 287 | 292 |
| 288 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); | 293 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); |
| 289 }; | 294 }; |
| 290 | 295 |
| 291 } // namespace test_runner | 296 } // namespace test_runner |
| 292 | 297 |
| 293 #endif // COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ | 298 #endif // COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ |
| OLD | NEW |