Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1208)

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 1194383003: Add a flag showing whether the current request was ignored by a handler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix trybot failures (DidFailProvisionalLoad calls in unit tests) Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 2593 matching lines...) Expand 10 before | Expand all | Expand 10 after
2604 2604
2605 void WebContentsImpl::DidFailProvisionalLoadWithError( 2605 void WebContentsImpl::DidFailProvisionalLoadWithError(
2606 RenderFrameHostImpl* render_frame_host, 2606 RenderFrameHostImpl* render_frame_host,
2607 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) { 2607 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) {
2608 GURL validated_url(params.url); 2608 GURL validated_url(params.url);
2609 FOR_EACH_OBSERVER(WebContentsObserver, 2609 FOR_EACH_OBSERVER(WebContentsObserver,
2610 observers_, 2610 observers_,
2611 DidFailProvisionalLoad(render_frame_host, 2611 DidFailProvisionalLoad(render_frame_host,
2612 validated_url, 2612 validated_url,
2613 params.error_code, 2613 params.error_code,
2614 params.error_description)); 2614 params.error_description,
2615 params.was_ignored_by_handler));
2615 2616
2616 FrameTreeNode* ftn = render_frame_host->frame_tree_node(); 2617 FrameTreeNode* ftn = render_frame_host->frame_tree_node();
2617 BrowserAccessibilityManager* manager = 2618 BrowserAccessibilityManager* manager =
2618 ftn->current_frame_host()->browser_accessibility_manager(); 2619 ftn->current_frame_host()->browser_accessibility_manager();
2619 if (manager) 2620 if (manager)
2620 manager->NavigationFailed(); 2621 manager->NavigationFailed();
2621 } 2622 }
2622 2623
2623 void WebContentsImpl::DidFailLoadWithError( 2624 void WebContentsImpl::DidFailLoadWithError(
2624 RenderFrameHostImpl* render_frame_host, 2625 RenderFrameHostImpl* render_frame_host,
2625 const GURL& url, 2626 const GURL& url,
2626 int error_code, 2627 int error_code,
2627 const base::string16& error_description) { 2628 const base::string16& error_description,
2629 bool was_ignored_by_handler) {
2628 FOR_EACH_OBSERVER( 2630 FOR_EACH_OBSERVER(
2629 WebContentsObserver, 2631 WebContentsObserver,
2630 observers_, 2632 observers_,
2631 DidFailLoad(render_frame_host, url, error_code, error_description)); 2633 DidFailLoad(render_frame_host, url, error_code, error_description,
2634 was_ignored_by_handler));
2632 } 2635 }
2633 2636
2634 void WebContentsImpl::NotifyChangedNavigationState( 2637 void WebContentsImpl::NotifyChangedNavigationState(
2635 InvalidateTypes changed_flags) { 2638 InvalidateTypes changed_flags) {
2636 NotifyNavigationStateChanged(changed_flags); 2639 NotifyNavigationStateChanged(changed_flags);
2637 } 2640 }
2638 2641
2639 void WebContentsImpl::AboutToNavigateRenderFrame( 2642 void WebContentsImpl::AboutToNavigateRenderFrame(
2640 RenderFrameHostImpl* old_host, 2643 RenderFrameHostImpl* old_host,
2641 RenderFrameHostImpl* new_host) { 2644 RenderFrameHostImpl* new_host) {
(...skipping 1749 matching lines...) Expand 10 before | Expand all | Expand 10 after
4391 player_map->erase(it); 4394 player_map->erase(it);
4392 } 4395 }
4393 4396
4394 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4397 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4395 force_disable_overscroll_content_ = force_disable; 4398 force_disable_overscroll_content_ = force_disable;
4396 if (view_) 4399 if (view_)
4397 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4400 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4398 } 4401 }
4399 4402
4400 } // namespace content 4403 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/browser/web_contents/web_contents_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698