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

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

Issue 1144463003: Remove Navigation Transitions from Chromium (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed TransitionPageHelper. Created 5 years, 7 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
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | content/test/test_render_frame_host.cc » ('j') | 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/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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 60
61 virtual void loadURLExternally(blink::WebLocalFrame* frame, 61 virtual void loadURLExternally(blink::WebLocalFrame* frame,
62 const blink::WebURLRequest& request, 62 const blink::WebURLRequest& request,
63 blink::WebNavigationPolicy policy, 63 blink::WebNavigationPolicy policy,
64 const blink::WebString& suggested_name) { 64 const blink::WebString& suggested_name) {
65 base_proxy_->LoadURLExternally(frame, request, policy, suggested_name); 65 base_proxy_->LoadURLExternally(frame, request, policy, suggested_name);
66 Base::loadURLExternally(frame, request, policy, suggested_name); 66 Base::loadURLExternally(frame, request, policy, suggested_name);
67 } 67 }
68 68
69 virtual void didStartProvisionalLoad(blink::WebLocalFrame* frame, 69 virtual void didStartProvisionalLoad(blink::WebLocalFrame* frame,
70 bool isTransitionNavigation,
71 double triggeringEventTime) { 70 double triggeringEventTime) {
72 base_proxy_->DidStartProvisionalLoad(frame); 71 base_proxy_->DidStartProvisionalLoad(frame);
73 Base::didStartProvisionalLoad( 72 Base::didStartProvisionalLoad(
74 frame, isTransitionNavigation, triggeringEventTime); 73 frame, triggeringEventTime);
75 } 74 }
76 75
77 virtual void didReceiveServerRedirectForProvisionalLoad( 76 virtual void didReceiveServerRedirectForProvisionalLoad(
78 blink::WebLocalFrame* frame) { 77 blink::WebLocalFrame* frame) {
79 base_proxy_->DidReceiveServerRedirectForProvisionalLoad(frame); 78 base_proxy_->DidReceiveServerRedirectForProvisionalLoad(frame);
80 Base::didReceiveServerRedirectForProvisionalLoad(frame); 79 Base::didReceiveServerRedirectForProvisionalLoad(frame);
81 } 80 }
82 81
83 virtual void didFailProvisionalLoad( 82 virtual void didFailProvisionalLoad(
84 blink::WebLocalFrame* frame, 83 blink::WebLocalFrame* frame,
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 #endif 291 #endif
293 292
294 WebTestProxyBase* base_proxy_; 293 WebTestProxyBase* base_proxy_;
295 294
296 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); 295 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy);
297 }; 296 };
298 297
299 } // namespace content 298 } // namespace content
300 299
301 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 300 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | content/test/test_render_frame_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698