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/browser/web_contents/web_contents_impl.h" | 5 #include "content/browser/web_contents/web_contents_impl.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
(...skipping 2577 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2588 | 2588 |
2589 void WebContentsImpl::DidFailProvisionalLoadWithError( | 2589 void WebContentsImpl::DidFailProvisionalLoadWithError( |
2590 RenderFrameHostImpl* render_frame_host, | 2590 RenderFrameHostImpl* render_frame_host, |
2591 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) { | 2591 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) { |
2592 GURL validated_url(params.url); | 2592 GURL validated_url(params.url); |
2593 FOR_EACH_OBSERVER(WebContentsObserver, | 2593 FOR_EACH_OBSERVER(WebContentsObserver, |
2594 observers_, | 2594 observers_, |
2595 DidFailProvisionalLoad(render_frame_host, | 2595 DidFailProvisionalLoad(render_frame_host, |
2596 validated_url, | 2596 validated_url, |
2597 params.error_code, | 2597 params.error_code, |
2598 params.error_description)); | 2598 params.error_description, |
| 2599 params.was_ignored_by_handler)); |
2599 | 2600 |
2600 FrameTreeNode* ftn = render_frame_host->frame_tree_node(); | 2601 FrameTreeNode* ftn = render_frame_host->frame_tree_node(); |
2601 BrowserAccessibilityManager* manager = | 2602 BrowserAccessibilityManager* manager = |
2602 ftn->current_frame_host()->browser_accessibility_manager(); | 2603 ftn->current_frame_host()->browser_accessibility_manager(); |
2603 if (manager) | 2604 if (manager) |
2604 manager->NavigationFailed(); | 2605 manager->NavigationFailed(); |
2605 } | 2606 } |
2606 | 2607 |
2607 void WebContentsImpl::DidFailLoadWithError( | 2608 void WebContentsImpl::DidFailLoadWithError( |
2608 RenderFrameHostImpl* render_frame_host, | 2609 RenderFrameHostImpl* render_frame_host, |
2609 const GURL& url, | 2610 const GURL& url, |
2610 int error_code, | 2611 int error_code, |
2611 const base::string16& error_description) { | 2612 const base::string16& error_description, |
| 2613 bool was_ignored_by_handler) { |
2612 FOR_EACH_OBSERVER( | 2614 FOR_EACH_OBSERVER( |
2613 WebContentsObserver, | 2615 WebContentsObserver, |
2614 observers_, | 2616 observers_, |
2615 DidFailLoad(render_frame_host, url, error_code, error_description)); | 2617 DidFailLoad(render_frame_host, url, error_code, error_description, |
| 2618 was_ignored_by_handler)); |
2616 } | 2619 } |
2617 | 2620 |
2618 void WebContentsImpl::NotifyChangedNavigationState( | 2621 void WebContentsImpl::NotifyChangedNavigationState( |
2619 InvalidateTypes changed_flags) { | 2622 InvalidateTypes changed_flags) { |
2620 NotifyNavigationStateChanged(changed_flags); | 2623 NotifyNavigationStateChanged(changed_flags); |
2621 } | 2624 } |
2622 | 2625 |
2623 void WebContentsImpl::AboutToNavigateRenderFrame( | 2626 void WebContentsImpl::AboutToNavigateRenderFrame( |
2624 RenderFrameHostImpl* old_host, | 2627 RenderFrameHostImpl* old_host, |
2625 RenderFrameHostImpl* new_host) { | 2628 RenderFrameHostImpl* new_host) { |
(...skipping 1766 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4392 player_map->erase(it); | 4395 player_map->erase(it); |
4393 } | 4396 } |
4394 | 4397 |
4395 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { | 4398 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { |
4396 force_disable_overscroll_content_ = force_disable; | 4399 force_disable_overscroll_content_ = force_disable; |
4397 if (view_) | 4400 if (view_) |
4398 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); | 4401 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); |
4399 } | 4402 } |
4400 | 4403 |
4401 } // namespace content | 4404 } // namespace content |
OLD | NEW |