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

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

Issue 1044923003: Add the WebHistoryCommitType to didFailProvisionalLoad, part 3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@committype1
Patch Set: fix Created 5 years, 8 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 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/mock_screen_orientation_client.h" 9 #include "content/shell/renderer/test_runner/mock_screen_orientation_client.h"
10 #include "content/shell/renderer/test_runner/test_interfaces.h" 10 #include "content/shell/renderer/test_runner/test_interfaces.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 Base::didStartProvisionalLoad( 73 Base::didStartProvisionalLoad(
74 frame, isTransitionNavigation, triggeringEventTime); 74 frame, isTransitionNavigation, triggeringEventTime);
75 } 75 }
76 76
77 virtual void didReceiveServerRedirectForProvisionalLoad( 77 virtual void didReceiveServerRedirectForProvisionalLoad(
78 blink::WebLocalFrame* frame) { 78 blink::WebLocalFrame* frame) {
79 base_proxy_->DidReceiveServerRedirectForProvisionalLoad(frame); 79 base_proxy_->DidReceiveServerRedirectForProvisionalLoad(frame);
80 Base::didReceiveServerRedirectForProvisionalLoad(frame); 80 Base::didReceiveServerRedirectForProvisionalLoad(frame);
81 } 81 }
82 82
83 virtual void didFailProvisionalLoad(blink::WebLocalFrame* frame, 83 virtual void didFailProvisionalLoad(
84 const blink::WebURLError& error) { 84 blink::WebLocalFrame* frame,
85 const blink::WebURLError& error,
86 blink::WebHistoryCommitType commit_type) {
85 // If the test finished, don't notify the embedder of the failed load, 87 // If the test finished, don't notify the embedder of the failed load,
86 // as we already destroyed the document loader. 88 // as we already destroyed the document loader.
87 if (base_proxy_->DidFailProvisionalLoad(frame, error)) 89 if (base_proxy_->DidFailProvisionalLoad(frame, error, commit_type))
88 return; 90 return;
89 Base::didFailProvisionalLoad(frame, error); 91 Base::didFailProvisionalLoad(frame, error, commit_type);
90 } 92 }
91 93
92 virtual void didCommitProvisionalLoad( 94 virtual void didCommitProvisionalLoad(
93 blink::WebLocalFrame* frame, 95 blink::WebLocalFrame* frame,
94 const blink::WebHistoryItem& item, 96 const blink::WebHistoryItem& item,
95 blink::WebHistoryCommitType commit_type) { 97 blink::WebHistoryCommitType commit_type) {
96 base_proxy_->DidCommitProvisionalLoad(frame, item, commit_type); 98 base_proxy_->DidCommitProvisionalLoad(frame, item, commit_type);
97 Base::didCommitProvisionalLoad(frame, item, commit_type); 99 Base::didCommitProvisionalLoad(frame, item, commit_type);
98 } 100 }
99 101
(...skipping 14 matching lines...) Expand all
114 base_proxy_->DidFinishDocumentLoad(frame); 116 base_proxy_->DidFinishDocumentLoad(frame);
115 Base::didFinishDocumentLoad(frame); 117 Base::didFinishDocumentLoad(frame);
116 } 118 }
117 119
118 virtual void didHandleOnloadEvents(blink::WebLocalFrame* frame) { 120 virtual void didHandleOnloadEvents(blink::WebLocalFrame* frame) {
119 base_proxy_->DidHandleOnloadEvents(frame); 121 base_proxy_->DidHandleOnloadEvents(frame);
120 Base::didHandleOnloadEvents(frame); 122 Base::didHandleOnloadEvents(frame);
121 } 123 }
122 124
123 virtual void didFailLoad(blink::WebLocalFrame* frame, 125 virtual void didFailLoad(blink::WebLocalFrame* frame,
124 const blink::WebURLError& error) { 126 const blink::WebURLError& error,
125 base_proxy_->DidFailLoad(frame, error); 127 blink::WebHistoryCommitType commit_type) {
126 Base::didFailLoad(frame, error); 128 base_proxy_->DidFailLoad(frame, error, commit_type);
129 Base::didFailLoad(frame, error, commit_type);
127 } 130 }
128 131
129 virtual void didFinishLoad(blink::WebLocalFrame* frame) { 132 virtual void didFinishLoad(blink::WebLocalFrame* frame) {
130 Base::didFinishLoad(frame); 133 Base::didFinishLoad(frame);
131 base_proxy_->DidFinishLoad(frame); 134 base_proxy_->DidFinishLoad(frame);
132 } 135 }
133 136
134 virtual void didChangeSelection(bool is_selection_empty) { 137 virtual void didChangeSelection(bool is_selection_empty) {
135 base_proxy_->DidChangeSelection(is_selection_empty); 138 base_proxy_->DidChangeSelection(is_selection_empty);
136 Base::didChangeSelection(is_selection_empty); 139 Base::didChangeSelection(is_selection_empty);
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 #endif 297 #endif
295 298
296 WebTestProxyBase* base_proxy_; 299 WebTestProxyBase* base_proxy_;
297 300
298 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); 301 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy);
299 }; 302 };
300 303
301 } // namespace content 304 } // namespace content
302 305
303 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 306 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
OLDNEW
« no previous file with comments | « content/renderer/render_view_browsertest.cc ('k') | content/shell/renderer/test_runner/web_test_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698