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

Side by Side Diff: content/browser/frame_host/navigation_handle_impl.cc

Issue 2696493003: Introduce SubframeNavigationFilteringThrottle (Closed)
Patch Set: fix test names Created 3 years, 10 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/frame_host/navigation_handle_impl.h" 5 #include "content/browser/frame_host/navigation_handle_impl.h"
6 6
7 #include <iterator> 7 #include <iterator>
8 8
9 #include "base/debug/dump_without_crashing.h" 9 #include "base/debug/dump_without_crashing.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 } 449 }
450 450
451 ReloadType NavigationHandleImpl::GetReloadType() { 451 ReloadType NavigationHandleImpl::GetReloadType() {
452 return reload_type_; 452 return reload_type_;
453 } 453 }
454 454
455 NavigationData* NavigationHandleImpl::GetNavigationData() { 455 NavigationData* NavigationHandleImpl::GetNavigationData() {
456 return navigation_data_.get(); 456 return navigation_data_.get();
457 } 457 }
458 458
459 bool NavigationHandleImpl::IsCancellingForTesting() {
460 return state_ == CANCELING;
461 }
462
459 const GlobalRequestID& NavigationHandleImpl::GetGlobalRequestID() { 463 const GlobalRequestID& NavigationHandleImpl::GetGlobalRequestID() {
460 DCHECK(state_ == WILL_PROCESS_RESPONSE || state_ == DEFERRING_RESPONSE || 464 DCHECK(state_ == WILL_PROCESS_RESPONSE || state_ == DEFERRING_RESPONSE ||
461 state_ == READY_TO_COMMIT); 465 state_ == READY_TO_COMMIT);
462 return request_id_; 466 return request_id_;
463 } 467 }
464 468
465 void NavigationHandleImpl::InitServiceWorkerHandle( 469 void NavigationHandleImpl::InitServiceWorkerHandle(
466 ServiceWorkerContextWrapper* service_worker_context) { 470 ServiceWorkerContextWrapper* service_worker_context) {
467 DCHECK(IsBrowserSideNavigationEnabled()); 471 DCHECK(IsBrowserSideNavigationEnabled());
468 service_worker_handle_.reset( 472 service_worker_handle_.reset(
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
883 content::AncestorThrottle::MaybeCreateThrottleFor(this); 887 content::AncestorThrottle::MaybeCreateThrottleFor(this);
884 if (ancestor_throttle) 888 if (ancestor_throttle)
885 throttles_.push_back(std::move(ancestor_throttle)); 889 throttles_.push_back(std::move(ancestor_throttle));
886 890
887 throttles_.insert(throttles_.begin(), 891 throttles_.insert(throttles_.begin(),
888 std::make_move_iterator(throttles_to_register.begin()), 892 std::make_move_iterator(throttles_to_register.begin()),
889 std::make_move_iterator(throttles_to_register.end())); 893 std::make_move_iterator(throttles_to_register.end()));
890 } 894 }
891 895
892 } // namespace content 896 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698