| 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 <memory> | 7 #include <memory> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 using error_page::NetErrorHelperCore; | 61 using error_page::NetErrorHelperCore; |
| 62 | 62 |
| 63 namespace { | 63 namespace { |
| 64 | 64 |
| 65 // Number of seconds to wait for the navigation correction service to return | 65 // Number of seconds to wait for the navigation correction service to return |
| 66 // suggestions. If it takes too long, just use the local error page. | 66 // suggestions. If it takes too long, just use the local error page. |
| 67 const int kNavigationCorrectionFetchTimeoutSec = 3; | 67 const int kNavigationCorrectionFetchTimeoutSec = 3; |
| 68 | 68 |
| 69 NetErrorHelperCore::PageType GetLoadingPageType(RenderFrame* render_frame) { | 69 NetErrorHelperCore::PageType GetLoadingPageType(RenderFrame* render_frame) { |
| 70 blink::WebFrame* web_frame = render_frame->GetWebFrame(); | 70 blink::WebFrame* web_frame = render_frame->GetWebFrame(); |
| 71 GURL url = web_frame->provisionalDataSource()->request().url(); | 71 GURL url = web_frame->provisionalDataSource()->getRequest().url(); |
| 72 if (!url.is_valid() || url.spec() != kUnreachableWebDataURL) | 72 if (!url.is_valid() || url.spec() != kUnreachableWebDataURL) |
| 73 return NetErrorHelperCore::NON_ERROR_PAGE; | 73 return NetErrorHelperCore::NON_ERROR_PAGE; |
| 74 return NetErrorHelperCore::ERROR_PAGE; | 74 return NetErrorHelperCore::ERROR_PAGE; |
| 75 } | 75 } |
| 76 | 76 |
| 77 NetErrorHelperCore::FrameType GetFrameType(RenderFrame* render_frame) { | 77 NetErrorHelperCore::FrameType GetFrameType(RenderFrame* render_frame) { |
| 78 if (render_frame->IsMainFrame()) | 78 if (render_frame->IsMainFrame()) |
| 79 return NetErrorHelperCore::MAIN_FRAME; | 79 return NetErrorHelperCore::MAIN_FRAME; |
| 80 return NetErrorHelperCore::SUB_FRAME; | 80 return NetErrorHelperCore::SUB_FRAME; |
| 81 } | 81 } |
| (...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 314 | 314 |
| 315 void NetErrorHelper::ReloadPage(bool bypass_cache) { | 315 void NetErrorHelper::ReloadPage(bool bypass_cache) { |
| 316 render_frame()->GetWebFrame()->reload( | 316 render_frame()->GetWebFrame()->reload( |
| 317 bypass_cache ? blink::WebFrameLoadType::ReloadBypassingCache | 317 bypass_cache ? blink::WebFrameLoadType::ReloadBypassingCache |
| 318 : blink::WebFrameLoadType::ReloadMainResource); | 318 : blink::WebFrameLoadType::ReloadMainResource); |
| 319 } | 319 } |
| 320 | 320 |
| 321 void NetErrorHelper::LoadPageFromCache(const GURL& page_url) { | 321 void NetErrorHelper::LoadPageFromCache(const GURL& page_url) { |
| 322 blink::WebFrame* web_frame = render_frame()->GetWebFrame(); | 322 blink::WebFrame* web_frame = render_frame()->GetWebFrame(); |
| 323 DCHECK(!base::EqualsASCII( | 323 DCHECK(!base::EqualsASCII( |
| 324 base::StringPiece16(web_frame->dataSource()->request().httpMethod()), | 324 base::StringPiece16(web_frame->dataSource()->getRequest().httpMethod()), |
| 325 "POST")); | 325 "POST")); |
| 326 | 326 |
| 327 blink::WebURLRequest request(page_url); | 327 blink::WebURLRequest request(page_url); |
| 328 request.setCachePolicy(blink::WebCachePolicy::ReturnCacheDataDontLoad); | 328 request.setCachePolicy(blink::WebCachePolicy::ReturnCacheDataDontLoad); |
| 329 web_frame->loadRequest(request); | 329 web_frame->loadRequest(request); |
| 330 } | 330 } |
| 331 | 331 |
| 332 void NetErrorHelper::DiagnoseError(const GURL& page_url) { | 332 void NetErrorHelper::DiagnoseError(const GURL& page_url) { |
| 333 GetRemoteNetworkDiagnostics()->RunNetworkDiagnostics(page_url); | 333 GetRemoteNetworkDiagnostics()->RunNetworkDiagnostics(page_url); |
| 334 } | 334 } |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 378 | 378 |
| 379 void NetErrorHelper::OnNetworkDiagnosticsClientRequest( | 379 void NetErrorHelper::OnNetworkDiagnosticsClientRequest( |
| 380 chrome::mojom::NetworkDiagnosticsClientAssociatedRequest request) { | 380 chrome::mojom::NetworkDiagnosticsClientAssociatedRequest request) { |
| 381 DCHECK(!network_diagnostics_client_binding_.is_bound()); | 381 DCHECK(!network_diagnostics_client_binding_.is_bound()); |
| 382 network_diagnostics_client_binding_.Bind(std::move(request)); | 382 network_diagnostics_client_binding_.Bind(std::move(request)); |
| 383 } | 383 } |
| 384 | 384 |
| 385 void NetErrorHelper::SetCanShowNetworkDiagnosticsDialog(bool can_show) { | 385 void NetErrorHelper::SetCanShowNetworkDiagnosticsDialog(bool can_show) { |
| 386 core_->OnSetCanShowNetworkDiagnosticsDialog(can_show); | 386 core_->OnSetCanShowNetworkDiagnosticsDialog(can_show); |
| 387 } | 387 } |
| OLD | NEW |