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

Side by Side Diff: content/test/test_web_contents.cc

Issue 2735183003: PlzNavigate: stop navigations when opening a document for write (Closed)
Patch Set: Addressed commemts Created 3 years, 9 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "content/test/test_web_contents.h" 5 #include "content/test/test_web_contents.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "content/browser/browser_url_handler_impl.h" 9 #include "content/browser/browser_url_handler_impl.h"
10 #include "content/browser/frame_host/cross_process_frame_connector.h" 10 #include "content/browser/frame_host/cross_process_frame_connector.h"
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 RenderFrameHostImpl* current_frame_host = 253 RenderFrameHostImpl* current_frame_host =
254 node->render_manager()->current_frame_host(); 254 node->render_manager()->current_frame_host();
255 DCHECK(current_frame_host); 255 DCHECK(current_frame_host);
256 current_frame_host->ResetLoadingState(); 256 current_frame_host->ResetLoadingState();
257 257
258 if (IsBrowserSideNavigationEnabled()) { 258 if (IsBrowserSideNavigationEnabled()) {
259 RenderFrameHostImpl* speculative_frame_host = 259 RenderFrameHostImpl* speculative_frame_host =
260 node->render_manager()->speculative_frame_host(); 260 node->render_manager()->speculative_frame_host();
261 if (speculative_frame_host) 261 if (speculative_frame_host)
262 speculative_frame_host->ResetLoadingState(); 262 speculative_frame_host->ResetLoadingState();
263 node->ResetNavigationRequest(false); 263 node->ResetNavigationRequest(false, true);
264 } else { 264 } else {
265 RenderFrameHostImpl* pending_frame_host = 265 RenderFrameHostImpl* pending_frame_host =
266 node->render_manager()->pending_frame_host(); 266 node->render_manager()->pending_frame_host();
267 if (pending_frame_host) 267 if (pending_frame_host)
268 pending_frame_host->ResetLoadingState(); 268 pending_frame_host->ResetLoadingState();
269 } 269 }
270 } 270 }
271 } 271 }
272 } 272 }
273 273
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 int route_id) { 401 int route_id) {
402 } 402 }
403 403
404 void TestWebContents::SaveFrameWithHeaders(const GURL& url, 404 void TestWebContents::SaveFrameWithHeaders(const GURL& url,
405 const Referrer& referrer, 405 const Referrer& referrer,
406 const std::string& headers) { 406 const std::string& headers) {
407 save_frame_headers_ = headers; 407 save_frame_headers_ = headers;
408 } 408 }
409 409
410 } // namespace content 410 } // namespace content
OLDNEW
« no previous file with comments | « content/test/test_render_frame_host.cc ('k') | third_party/WebKit/LayoutTests/FlagExpectations/enable-browser-side-navigation » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698