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

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

Issue 2498433002: Revert of Expose GlobalRequestID in NavigationHandle and ResourceRequestInfo. (Closed)
Patch Set: Created 4 years, 1 month 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 <utility>
8
7 #include "base/debug/dump_without_crashing.h" 9 #include "base/debug/dump_without_crashing.h"
8 #include "base/logging.h" 10 #include "base/logging.h"
9 #include "content/browser/browsing_data/clear_site_data_throttle.h" 11 #include "content/browser/browsing_data/clear_site_data_throttle.h"
10 #include "content/browser/child_process_security_policy_impl.h" 12 #include "content/browser/child_process_security_policy_impl.h"
11 #include "content/browser/devtools/render_frame_devtools_agent_host.h" 13 #include "content/browser/devtools/render_frame_devtools_agent_host.h"
12 #include "content/browser/frame_host/frame_tree_node.h" 14 #include "content/browser/frame_host/frame_tree_node.h"
13 #include "content/browser/frame_host/navigator.h" 15 #include "content/browser/frame_host/navigator.h"
14 #include "content/browser/frame_host/navigator_delegate.h" 16 #include "content/browser/frame_host/navigator_delegate.h"
15 #include "content/browser/service_worker/service_worker_context_wrapper.h" 17 #include "content/browser/service_worker/service_worker_context_wrapper.h"
16 #include "content/browser/service_worker/service_worker_navigation_handle.h" 18 #include "content/browser/service_worker/service_worker_navigation_handle.h"
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 params.page_state = PageState::CreateFromURL(url); 364 params.page_state = PageState::CreateFromURL(url);
363 params.contents_mime_type = std::string("text/html"); 365 params.contents_mime_type = std::string("text/html");
364 366
365 DidCommitNavigation(params, false, render_frame_host_); 367 DidCommitNavigation(params, false, render_frame_host_);
366 } 368 }
367 369
368 NavigationData* NavigationHandleImpl::GetNavigationData() { 370 NavigationData* NavigationHandleImpl::GetNavigationData() {
369 return navigation_data_.get(); 371 return navigation_data_.get();
370 } 372 }
371 373
372 const GlobalRequestID& NavigationHandleImpl::GetGlobalRequestID() {
373 DCHECK(state_ == WILL_PROCESS_RESPONSE || state_ == DEFERRING_RESPONSE ||
374 state_ == READY_TO_COMMIT);
375 return request_id_;
376 }
377
378 void NavigationHandleImpl::InitServiceWorkerHandle( 374 void NavigationHandleImpl::InitServiceWorkerHandle(
379 ServiceWorkerContextWrapper* service_worker_context) { 375 ServiceWorkerContextWrapper* service_worker_context) {
380 DCHECK(IsBrowserSideNavigationEnabled()); 376 DCHECK(IsBrowserSideNavigationEnabled());
381 service_worker_handle_.reset( 377 service_worker_handle_.reset(
382 new ServiceWorkerNavigationHandle(service_worker_context)); 378 new ServiceWorkerNavigationHandle(service_worker_context));
383 } 379 }
384 380
385 void NavigationHandleImpl::WillStartRequest( 381 void NavigationHandleImpl::WillStartRequest(
386 const std::string& method, 382 const std::string& method,
387 scoped_refptr<content::ResourceRequestBodyImpl> resource_request_body, 383 scoped_refptr<content::ResourceRequestBodyImpl> resource_request_body,
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
759 throttles_to_register.end()); 755 throttles_to_register.end());
760 throttles_to_register.weak_clear(); 756 throttles_to_register.weak_clear();
761 } 757 }
762 } 758 }
763 759
764 bool NavigationHandleImpl::WasStartedFromContextMenu() const { 760 bool NavigationHandleImpl::WasStartedFromContextMenu() const {
765 return started_from_context_menu_; 761 return started_from_context_menu_;
766 } 762 }
767 763
768 } // namespace content 764 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/navigation_handle_impl.h ('k') | content/browser/frame_host/render_frame_host_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698