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

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

Issue 2779893006: Remove WebLocalFrame* from didReceiveServerRedirectForProvisionalLoad (Closed)
Patch Set: Created 3 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_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 5 #ifndef CONTENT_SHELL_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
6 #define CONTENT_SHELL_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 6 #define CONTENT_SHELL_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 Base::loadURLExternally(request, policy, suggested_name, 95 Base::loadURLExternally(request, policy, suggested_name,
96 replaces_current_history_item); 96 replaces_current_history_item);
97 } 97 }
98 98
99 void didStartProvisionalLoad(blink::WebDataSource* data_source, 99 void didStartProvisionalLoad(blink::WebDataSource* data_source,
100 blink::WebURLRequest& request) override { 100 blink::WebURLRequest& request) override {
101 test_client()->didStartProvisionalLoad(data_source, request); 101 test_client()->didStartProvisionalLoad(data_source, request);
102 Base::didStartProvisionalLoad(data_source, request); 102 Base::didStartProvisionalLoad(data_source, request);
103 } 103 }
104 104
105 void didReceiveServerRedirectForProvisionalLoad( 105 void didReceiveServerRedirectForProvisionalLoad() override {
106 blink::WebLocalFrame* frame) override { 106 test_client()->didReceiveServerRedirectForProvisionalLoad();
107 test_client()->didReceiveServerRedirectForProvisionalLoad(frame); 107 Base::didReceiveServerRedirectForProvisionalLoad();
108 Base::didReceiveServerRedirectForProvisionalLoad(frame);
109 } 108 }
110 109
111 void didFailProvisionalLoad( 110 void didFailProvisionalLoad(
112 blink::WebLocalFrame* frame, 111 blink::WebLocalFrame* frame,
113 const blink::WebURLError& error, 112 const blink::WebURLError& error,
114 blink::WebHistoryCommitType commit_type) override { 113 blink::WebHistoryCommitType commit_type) override {
115 test_client()->didFailProvisionalLoad(frame, error, commit_type); 114 test_client()->didFailProvisionalLoad(frame, error, commit_type);
116 // If the test finished, don't notify the embedder of the failed load, 115 // If the test finished, don't notify the embedder of the failed load,
117 // as we already destroyed the document loader. 116 // as we already destroyed the document loader.
118 if (!frame->provisionalDataSource()) 117 if (!frame->provisionalDataSource())
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 return test_client()->runFileChooser(params, completion); 297 return test_client()->runFileChooser(params, completion);
299 } 298 }
300 299
301 private: 300 private:
302 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); 301 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy);
303 }; 302 };
304 303
305 } // namespace test_runner 304 } // namespace test_runner
306 305
307 #endif // CONTENT_SHELL_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 306 #endif // CONTENT_SHELL_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
OLDNEW
« no previous file with comments | « content/shell/test_runner/web_frame_test_client.cc ('k') | third_party/WebKit/Source/web/LocalFrameClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698