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

Side by Side Diff: content/browser/devtools/render_frame_devtools_agent_host.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/devtools/render_frame_devtools_agent_host.h" 5 #include "content/browser/devtools/render_frame_devtools_agent_host.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "content/browser/child_process_security_policy_impl.h" 10 #include "content/browser/child_process_security_policy_impl.h"
(...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 ui::PageTransition transition_type) { 592 ui::PageTransition transition_type) {
593 if (pending_ && pending_->host() == render_frame_host) 593 if (pending_ && pending_->host() == render_frame_host)
594 CommitPending(); 594 CommitPending();
595 service_worker_handler_->UpdateHosts(); 595 service_worker_handler_->UpdateHosts();
596 } 596 }
597 597
598 void RenderFrameDevToolsAgentHost::DidFailProvisionalLoad( 598 void RenderFrameDevToolsAgentHost::DidFailProvisionalLoad(
599 RenderFrameHost* render_frame_host, 599 RenderFrameHost* render_frame_host,
600 const GURL& validated_url, 600 const GURL& validated_url,
601 int error_code, 601 int error_code,
602 const base::string16& error_description) { 602 const base::string16& error_description,
603 bool was_ignored_by_handler) {
603 if (pending_ && pending_->host() == render_frame_host) 604 if (pending_ && pending_->host() == render_frame_host)
604 DiscardPending(); 605 DiscardPending();
605 } 606 }
606 607
607 void RenderFrameDevToolsAgentHost::UpdateProtocolHandlers( 608 void RenderFrameDevToolsAgentHost::UpdateProtocolHandlers(
608 RenderFrameHostImpl* host) { 609 RenderFrameHostImpl* host) {
609 dom_handler_->SetRenderFrameHost(host); 610 dom_handler_->SetRenderFrameHost(host);
610 if (emulation_handler_) 611 if (emulation_handler_)
611 emulation_handler_->SetRenderFrameHost(host); 612 emulation_handler_->SetRenderFrameHost(host);
612 input_handler_->SetRenderWidgetHost( 613 input_handler_->SetRenderWidgetHost(
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
711 RenderFrameHost* host) { 712 RenderFrameHost* host) {
712 return (current_ && current_->host() == host) || 713 return (current_ && current_->host() == host) ||
713 (pending_ && pending_->host() == host); 714 (pending_ && pending_->host() == host);
714 } 715 }
715 716
716 bool RenderFrameDevToolsAgentHost::IsChildFrame() { 717 bool RenderFrameDevToolsAgentHost::IsChildFrame() {
717 return current_ && current_->host()->GetParent(); 718 return current_ && current_->host()->GetParent();
718 } 719 }
719 720
720 } // namespace content 721 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698