| OLD | NEW |
| 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/renderer/render_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 3633 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3644 params.url = error.unreachableURL; | 3644 params.url = error.unreachableURL; |
| 3645 params.showing_repost_interstitial = show_repost_interstitial; | 3645 params.showing_repost_interstitial = show_repost_interstitial; |
| 3646 Send(new ViewHostMsg_DidFailProvisionalLoadWithError( | 3646 Send(new ViewHostMsg_DidFailProvisionalLoadWithError( |
| 3647 routing_id_, params)); | 3647 routing_id_, params)); |
| 3648 | 3648 |
| 3649 // Don't display an error page if this is simply a cancelled load. Aside | 3649 // Don't display an error page if this is simply a cancelled load. Aside |
| 3650 // from being dumb, WebCore doesn't expect it and it will cause a crash. | 3650 // from being dumb, WebCore doesn't expect it and it will cause a crash. |
| 3651 if (error.reason == net::ERR_ABORTED) | 3651 if (error.reason == net::ERR_ABORTED) |
| 3652 return; | 3652 return; |
| 3653 | 3653 |
| 3654 // Allow the embedder to suppress an error page. |
| 3655 if (GetContentClient()->renderer()->ShouldSuppressErrorPage( |
| 3656 error.unreachableURL)) { |
| 3657 return; |
| 3658 } |
| 3659 |
| 3654 if (RenderThreadImpl::current()->layout_test_mode()) | 3660 if (RenderThreadImpl::current()->layout_test_mode()) |
| 3655 return; | 3661 return; |
| 3656 | 3662 |
| 3657 // Make sure we never show errors in view source mode. | 3663 // Make sure we never show errors in view source mode. |
| 3658 frame->enableViewSourceMode(false); | 3664 frame->enableViewSourceMode(false); |
| 3659 | 3665 |
| 3660 DocumentState* document_state = DocumentState::FromDataSource(ds); | 3666 DocumentState* document_state = DocumentState::FromDataSource(ds); |
| 3661 NavigationState* navigation_state = document_state->navigation_state(); | 3667 NavigationState* navigation_state = document_state->navigation_state(); |
| 3662 | 3668 |
| 3663 // If this is a failed back/forward/reload navigation, then we need to do a | 3669 // If this is a failed back/forward/reload navigation, then we need to do a |
| (...skipping 2864 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6528 for (size_t i = 0; i < icon_urls.size(); i++) { | 6534 for (size_t i = 0; i < icon_urls.size(); i++) { |
| 6529 WebURL url = icon_urls[i].iconURL(); | 6535 WebURL url = icon_urls[i].iconURL(); |
| 6530 if (!url.isEmpty()) | 6536 if (!url.isEmpty()) |
| 6531 urls.push_back(FaviconURL(url, | 6537 urls.push_back(FaviconURL(url, |
| 6532 ToFaviconType(icon_urls[i].iconType()))); | 6538 ToFaviconType(icon_urls[i].iconType()))); |
| 6533 } | 6539 } |
| 6534 SendUpdateFaviconURL(urls); | 6540 SendUpdateFaviconURL(urls); |
| 6535 } | 6541 } |
| 6536 | 6542 |
| 6537 } // namespace content | 6543 } // namespace content |
| OLD | NEW |