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

Side by Side Diff: content/shell/renderer/test_runner/web_frame_test_proxy.h

Issue 313683004: Reorder the calls in WebFrameTestProxy::didFinishLoad (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 5 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "content/shell/renderer/test_runner/TestInterfaces.h" 9 #include "content/shell/renderer/test_runner/TestInterfaces.h"
10 #include "content/shell/renderer/test_runner/WebTestDelegate.h" 10 #include "content/shell/renderer/test_runner/WebTestDelegate.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 Base::didHandleOnloadEvents(frame); 108 Base::didHandleOnloadEvents(frame);
109 } 109 }
110 110
111 virtual void didFailLoad(blink::WebLocalFrame* frame, 111 virtual void didFailLoad(blink::WebLocalFrame* frame,
112 const blink::WebURLError& error) { 112 const blink::WebURLError& error) {
113 base_proxy_->DidFailLoad(frame, error); 113 base_proxy_->DidFailLoad(frame, error);
114 Base::didFailLoad(frame, error); 114 Base::didFailLoad(frame, error);
115 } 115 }
116 116
117 virtual void didFinishLoad(blink::WebLocalFrame* frame) { 117 virtual void didFinishLoad(blink::WebLocalFrame* frame) {
118 Base::didFinishLoad(frame);
118 base_proxy_->DidFinishLoad(frame); 119 base_proxy_->DidFinishLoad(frame);
119 Base::didFinishLoad(frame);
120 } 120 }
121 121
122 virtual blink::WebNotificationPresenter* notificationPresenter() { 122 virtual blink::WebNotificationPresenter* notificationPresenter() {
123 return base_proxy_->GetNotificationPresenter(); 123 return base_proxy_->GetNotificationPresenter();
124 } 124 }
125 125
126 virtual void didChangeSelection(bool is_selection_empty) { 126 virtual void didChangeSelection(bool is_selection_empty) {
127 base_proxy_->DidChangeSelection(is_selection_empty); 127 base_proxy_->DidChangeSelection(is_selection_empty);
128 Base::didChangeSelection(is_selection_empty); 128 Base::didChangeSelection(is_selection_empty);
129 } 129 }
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 } 278 }
279 279
280 WebTestProxyBase* base_proxy_; 280 WebTestProxyBase* base_proxy_;
281 281
282 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); 282 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy);
283 }; 283 };
284 284
285 } // namespace content 285 } // namespace content
286 286
287 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 287 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698