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

Side by Side Diff: chrome/renderer/net/net_error_helper.cc

Issue 2772753002: Change FrameLoadTypeReload to take FrameLoadTypeReloadMainResource's behavior (Closed)
Patch Set: rebase error fix (replace newly added ReloadMainResource) 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
« no previous file with comments | « chrome/renderer/content_settings_observer.cc ('k') | content/renderer/render_frame_impl.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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "chrome/renderer/net/net_error_helper.h" 5 #include "chrome/renderer/net/net_error_helper.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 tracking_fetcher_->Start( 307 tracking_fetcher_->Start(
308 render_frame()->GetWebFrame(), 308 render_frame()->GetWebFrame(),
309 blink::WebURLRequest::RequestContextInternal, 309 blink::WebURLRequest::RequestContextInternal,
310 base::Bind(&NetErrorHelper::OnTrackingRequestComplete, 310 base::Bind(&NetErrorHelper::OnTrackingRequestComplete,
311 base::Unretained(this))); 311 base::Unretained(this)));
312 } 312 }
313 313
314 void NetErrorHelper::ReloadPage(bool bypass_cache) { 314 void NetErrorHelper::ReloadPage(bool bypass_cache) {
315 render_frame()->GetWebFrame()->reload( 315 render_frame()->GetWebFrame()->reload(
316 bypass_cache ? blink::WebFrameLoadType::ReloadBypassingCache 316 bypass_cache ? blink::WebFrameLoadType::ReloadBypassingCache
317 : blink::WebFrameLoadType::ReloadMainResource); 317 : blink::WebFrameLoadType::Reload);
318 } 318 }
319 319
320 void NetErrorHelper::LoadPageFromCache(const GURL& page_url) { 320 void NetErrorHelper::LoadPageFromCache(const GURL& page_url) {
321 blink::WebFrame* web_frame = render_frame()->GetWebFrame(); 321 blink::WebFrame* web_frame = render_frame()->GetWebFrame();
322 DCHECK_NE("POST", web_frame->dataSource()->getRequest().httpMethod().ascii()); 322 DCHECK_NE("POST", web_frame->dataSource()->getRequest().httpMethod().ascii());
323 323
324 blink::WebURLRequest request(page_url); 324 blink::WebURLRequest request(page_url);
325 request.setCachePolicy(blink::WebCachePolicy::ReturnCacheDataDontLoad); 325 request.setCachePolicy(blink::WebCachePolicy::ReturnCacheDataDontLoad);
326 web_frame->loadRequest(request); 326 web_frame->loadRequest(request);
327 } 327 }
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 383
384 void NetErrorHelper::OnNetworkDiagnosticsClientRequest( 384 void NetErrorHelper::OnNetworkDiagnosticsClientRequest(
385 chrome::mojom::NetworkDiagnosticsClientAssociatedRequest request) { 385 chrome::mojom::NetworkDiagnosticsClientAssociatedRequest request) {
386 DCHECK(!network_diagnostics_client_binding_.is_bound()); 386 DCHECK(!network_diagnostics_client_binding_.is_bound());
387 network_diagnostics_client_binding_.Bind(std::move(request)); 387 network_diagnostics_client_binding_.Bind(std::move(request));
388 } 388 }
389 389
390 void NetErrorHelper::SetCanShowNetworkDiagnosticsDialog(bool can_show) { 390 void NetErrorHelper::SetCanShowNetworkDiagnosticsDialog(bool can_show) {
391 core_->OnSetCanShowNetworkDiagnosticsDialog(can_show); 391 core_->OnSetCanShowNetworkDiagnosticsDialog(can_show);
392 } 392 }
OLDNEW
« no previous file with comments | « chrome/renderer/content_settings_observer.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698