OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "content/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 938 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
949 if (error.reason == net::ERR_ABORTED) | 949 if (error.reason == net::ERR_ABORTED) |
950 return; | 950 return; |
951 | 951 |
952 // Don't display "client blocked" error page if browser has asked us not to. | 952 // Don't display "client blocked" error page if browser has asked us not to. |
953 if (error.reason == net::ERR_BLOCKED_BY_CLIENT && | 953 if (error.reason == net::ERR_BLOCKED_BY_CLIENT && |
954 render_view_->renderer_preferences_.disable_client_blocked_error_page) { | 954 render_view_->renderer_preferences_.disable_client_blocked_error_page) { |
955 return; | 955 return; |
956 } | 956 } |
957 | 957 |
958 // Allow the embedder to suppress an error page. | 958 // Allow the embedder to suppress an error page. |
959 if (GetContentClient()->renderer()->ShouldSuppressErrorPage( | 959 if (GetContentClient()->renderer()->ShouldSuppressErrorPage(this, |
jam
2014/01/10 18:26:44
nit: according to style guide, the first parameter
| |
960 error.unreachableURL)) { | 960 error.unreachableURL)) { |
961 return; | 961 return; |
962 } | 962 } |
963 | 963 |
964 if (RenderThreadImpl::current() && | 964 if (RenderThreadImpl::current() && |
965 RenderThreadImpl::current()->layout_test_mode()) { | 965 RenderThreadImpl::current()->layout_test_mode()) { |
966 return; | 966 return; |
967 } | 967 } |
968 | 968 |
969 // Make sure we never show errors in view source mode. | 969 // Make sure we never show errors in view source mode. |
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1521 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) { | 1521 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) { |
1522 observers_.AddObserver(observer); | 1522 observers_.AddObserver(observer); |
1523 } | 1523 } |
1524 | 1524 |
1525 void RenderFrameImpl::RemoveObserver(RenderFrameObserver* observer) { | 1525 void RenderFrameImpl::RemoveObserver(RenderFrameObserver* observer) { |
1526 observer->RenderFrameGone(); | 1526 observer->RenderFrameGone(); |
1527 observers_.RemoveObserver(observer); | 1527 observers_.RemoveObserver(observer); |
1528 } | 1528 } |
1529 | 1529 |
1530 } // namespace content | 1530 } // namespace content |
OLD | NEW |