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

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

Issue 958083002: PlzNavigate: Show error pages when the navigation failed before commit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@support-data-urls
Patch Set: Updated test Created 5 years, 8 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
« no previous file with comments | « content/browser/frame_host/navigator.h ('k') | content/browser/frame_host/navigator_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 bool should_replace_current_entry, 70 bool should_replace_current_entry,
71 bool user_gesture) override; 71 bool user_gesture) override;
72 void OnBeforeUnloadACK(FrameTreeNode* frame_tree_node, bool proceed) override; 72 void OnBeforeUnloadACK(FrameTreeNode* frame_tree_node, bool proceed) override;
73 void OnBeginNavigation(FrameTreeNode* frame_tree_node, 73 void OnBeginNavigation(FrameTreeNode* frame_tree_node,
74 const CommonNavigationParams& common_params, 74 const CommonNavigationParams& common_params,
75 const BeginNavigationParams& begin_params, 75 const BeginNavigationParams& begin_params,
76 scoped_refptr<ResourceRequestBody> body) override; 76 scoped_refptr<ResourceRequestBody> body) override;
77 void CommitNavigation(FrameTreeNode* frame_tree_node, 77 void CommitNavigation(FrameTreeNode* frame_tree_node,
78 ResourceResponse* response, 78 ResourceResponse* response,
79 scoped_ptr<StreamHandle> body) override; 79 scoped_ptr<StreamHandle> body) override;
80 void FailedNavigation(FrameTreeNode* frame_tree_node,
81 bool has_stale_copy_in_cache,
82 int error_code) override;
80 void LogResourceRequestTime(base::TimeTicks timestamp, 83 void LogResourceRequestTime(base::TimeTicks timestamp,
81 const GURL& url) override; 84 const GURL& url) override;
82 void LogBeforeUnloadTime( 85 void LogBeforeUnloadTime(
83 const base::TimeTicks& renderer_before_unload_start_time, 86 const base::TimeTicks& renderer_before_unload_start_time,
84 const base::TimeTicks& renderer_before_unload_end_time) override; 87 const base::TimeTicks& renderer_before_unload_end_time) override;
85 void CancelNavigation(FrameTreeNode* frame_tree_node) override; 88 void CancelNavigation(FrameTreeNode* frame_tree_node) override;
86 bool IsWaitingForBeforeUnloadACK(FrameTreeNode* frame_tree_node) override; 89 bool IsWaitingForBeforeUnloadACK(FrameTreeNode* frame_tree_node) override;
87 90
88 // PlzNavigate 91 // PlzNavigate
89 // Returns the navigation request for a given node. Used in tests. 92 // Returns the navigation request for a given node. Used in tests.
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 // different FrameTreeNodes, based on the frame_tree_node_id. 146 // different FrameTreeNodes, based on the frame_tree_node_id.
144 typedef base::ScopedPtrHashMap<int64, NavigationRequest> NavigationRequestMap; 147 typedef base::ScopedPtrHashMap<int64, NavigationRequest> NavigationRequestMap;
145 NavigationRequestMap navigation_request_map_; 148 NavigationRequestMap navigation_request_map_;
146 149
147 DISALLOW_COPY_AND_ASSIGN(NavigatorImpl); 150 DISALLOW_COPY_AND_ASSIGN(NavigatorImpl);
148 }; 151 };
149 152
150 } // namespace content 153 } // namespace content
151 154
152 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_ 155 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/frame_host/navigator.h ('k') | content/browser/frame_host/navigator_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698