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

Side by Side Diff: components/test_runner/web_frame_test_proxy.h

Issue 1381003004: Better distinguish didFinishLoad and didStopLoading (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
OLDNEW
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 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 blink::WebFrame* target_frame, 259 blink::WebFrame* target_frame,
260 blink::WebSecurityOrigin target, 260 blink::WebSecurityOrigin target,
261 blink::WebDOMMessageEvent event) { 261 blink::WebDOMMessageEvent event) {
262 if (base_proxy_->WillCheckAndDispatchMessageEvent( 262 if (base_proxy_->WillCheckAndDispatchMessageEvent(
263 source_frame, target_frame, target, event)) 263 source_frame, target_frame, target, event))
264 return true; 264 return true;
265 return Base::willCheckAndDispatchMessageEvent( 265 return Base::willCheckAndDispatchMessageEvent(
266 source_frame, target_frame, target, event); 266 source_frame, target_frame, target, event);
267 } 267 }
268 268
269 virtual void didStopLoading() {
270 base_proxy_->DidStopLoading();
271 Base::didStopLoading();
272 }
273
274 virtual void postAccessibilityEvent(const blink::WebAXObject& object, 269 virtual void postAccessibilityEvent(const blink::WebAXObject& object,
275 blink::WebAXEvent event) { 270 blink::WebAXEvent event) {
276 base_proxy_->PostAccessibilityEvent(object, event); 271 base_proxy_->PostAccessibilityEvent(object, event);
277 Base::postAccessibilityEvent(object, event); 272 Base::postAccessibilityEvent(object, event);
278 } 273 }
279 274
280 private: 275 private:
281 WebTestProxyBase* base_proxy_; 276 WebTestProxyBase* base_proxy_;
282 277
283 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); 278 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy);
284 }; 279 };
285 280
286 } // namespace test_runner 281 } // namespace test_runner
287 282
288 #endif // COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 283 #endif // COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698