| OLD | NEW |
| 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 <string> | 7 #include <string> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 298 tracking_fetcher_->Start( | 298 tracking_fetcher_->Start( |
| 299 render_frame()->GetWebFrame(), | 299 render_frame()->GetWebFrame(), |
| 300 blink::WebURLRequest::RequestContextInternal, | 300 blink::WebURLRequest::RequestContextInternal, |
| 301 blink::WebURLRequest::FrameTypeTopLevel, | 301 blink::WebURLRequest::FrameTypeTopLevel, |
| 302 content::ResourceFetcher::PLATFORM_LOADER, | 302 content::ResourceFetcher::PLATFORM_LOADER, |
| 303 base::Bind(&NetErrorHelper::OnTrackingRequestComplete, | 303 base::Bind(&NetErrorHelper::OnTrackingRequestComplete, |
| 304 base::Unretained(this))); | 304 base::Unretained(this))); |
| 305 } | 305 } |
| 306 | 306 |
| 307 void NetErrorHelper::ReloadPage(bool ignore_cache) { | 307 void NetErrorHelper::ReloadPage(bool ignore_cache) { |
| 308 render_frame()->GetWebFrame()->reload(ignore_cache); | 308 // TODO(crbug.com/599364): Rename |ignore_cache| or change it to enum. |
| 309 render_frame()->GetWebFrame()->reload( |
| 310 ignore_cache ? blink::WebFrameLoadType::ReloadBypassingCache |
| 311 : blink::WebFrameLoadType::Reload); |
| 309 } | 312 } |
| 310 | 313 |
| 311 void NetErrorHelper::LoadPageFromCache(const GURL& page_url) { | 314 void NetErrorHelper::LoadPageFromCache(const GURL& page_url) { |
| 312 blink::WebFrame* web_frame = render_frame()->GetWebFrame(); | 315 blink::WebFrame* web_frame = render_frame()->GetWebFrame(); |
| 313 DCHECK(!base::EqualsASCII( | 316 DCHECK(!base::EqualsASCII( |
| 314 base::StringPiece16(web_frame->dataSource()->request().httpMethod()), | 317 base::StringPiece16(web_frame->dataSource()->request().httpMethod()), |
| 315 "POST")); | 318 "POST")); |
| 316 | 319 |
| 317 blink::WebURLRequest request(page_url); | 320 blink::WebURLRequest request(page_url); |
| 318 request.setCachePolicy(blink::WebURLRequest::ReturnCacheDataDontLoad); | 321 request.setCachePolicy(blink::WebURLRequest::ReturnCacheDataDontLoad); |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 374 const blink::WebURLResponse& response, | 377 const blink::WebURLResponse& response, |
| 375 const std::string& data) { | 378 const std::string& data) { |
| 376 tracking_fetcher_.reset(); | 379 tracking_fetcher_.reset(); |
| 377 } | 380 } |
| 378 | 381 |
| 379 #if defined(OS_ANDROID) | 382 #if defined(OS_ANDROID) |
| 380 void NetErrorHelper::OnSetHasOfflinePages(bool has_offline_pages) { | 383 void NetErrorHelper::OnSetHasOfflinePages(bool has_offline_pages) { |
| 381 core_->OnSetHasOfflinePages(has_offline_pages); | 384 core_->OnSetHasOfflinePages(has_offline_pages); |
| 382 } | 385 } |
| 383 #endif // defined(OS_ANDROID) | 386 #endif // defined(OS_ANDROID) |
| OLD | NEW |