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

Side by Side Diff: content/browser/frame_host/navigator_impl.h

Issue 914223002: PlzNavigate: Updated navigation cancel policy for renderer-initiated requests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes from CR comments. Created 5 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_
7 7
8 #include "base/containers/scoped_ptr_hash_map.h" 8 #include "base/containers/scoped_ptr_hash_map.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 const GURL& url, 64 const GURL& url,
65 SiteInstance* source_site_instance, 65 SiteInstance* source_site_instance,
66 const std::vector<GURL>& redirect_chain, 66 const std::vector<GURL>& redirect_chain,
67 const Referrer& referrer, 67 const Referrer& referrer,
68 ui::PageTransition page_transition, 68 ui::PageTransition page_transition,
69 WindowOpenDisposition disposition, 69 WindowOpenDisposition disposition,
70 const GlobalRequestID& transferred_global_request_id, 70 const GlobalRequestID& transferred_global_request_id,
71 bool should_replace_current_entry, 71 bool should_replace_current_entry,
72 bool user_gesture) override; 72 bool user_gesture) override;
73 void OnBeforeUnloadACK(FrameTreeNode* frame_tree_node, bool proceed) override; 73 void OnBeforeUnloadACK(FrameTreeNode* frame_tree_node, bool proceed) override;
74 void OnBeginNavigation(FrameTreeNode* frame_tree_node, 74 void RendererInitiatedNavigationRequest(
75 const CommonNavigationParams& common_params, 75 FrameTreeNode* frame_tree_node,
76 const BeginNavigationParams& begin_params, 76 const CommonNavigationParams& common_params,
77 scoped_refptr<ResourceRequestBody> body) override; 77 const BeginNavigationParams& begin_params,
78 scoped_refptr<ResourceRequestBody> body)
79 override;
78 void CommitNavigation(FrameTreeNode* frame_tree_node, 80 void CommitNavigation(FrameTreeNode* frame_tree_node,
79 ResourceResponse* response, 81 ResourceResponse* response,
80 scoped_ptr<StreamHandle> body) override; 82 scoped_ptr<StreamHandle> body) override;
81 void LogResourceRequestTime(base::TimeTicks timestamp, 83 void LogResourceRequestTime(base::TimeTicks timestamp,
82 const GURL& url) override; 84 const GURL& url) override;
83 void LogBeforeUnloadTime( 85 void LogBeforeUnloadTime(
84 const base::TimeTicks& renderer_before_unload_start_time, 86 const base::TimeTicks& renderer_before_unload_start_time,
85 const base::TimeTicks& renderer_before_unload_end_time) override; 87 const base::TimeTicks& renderer_before_unload_end_time) override;
86 void CancelNavigation(FrameTreeNode* frame_tree_node) override; 88 void CancelNavigation(FrameTreeNode* frame_tree_node) override;
87 bool IsWaitingForBeforeUnloadACK(FrameTreeNode* frame_tree_node) override; 89 bool IsWaitingForBeforeUnloadACK(FrameTreeNode* frame_tree_node) override;
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 // different FrameTreeNodes, based on the frame_tree_node_id. 146 // different FrameTreeNodes, based on the frame_tree_node_id.
145 typedef base::ScopedPtrHashMap<int64, NavigationRequest> NavigationRequestMap; 147 typedef base::ScopedPtrHashMap<int64, NavigationRequest> NavigationRequestMap;
146 NavigationRequestMap navigation_request_map_; 148 NavigationRequestMap navigation_request_map_;
147 149
148 DISALLOW_COPY_AND_ASSIGN(NavigatorImpl); 150 DISALLOW_COPY_AND_ASSIGN(NavigatorImpl);
149 }; 151 };
150 152
151 } // namespace content 153 } // namespace content
152 154
153 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_ 155 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698