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

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

Issue 556703004: Remove page id from FrameNavigateParams. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes Created 6 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
« 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 bool is_transition_navigation) override; 42 bool is_transition_navigation) override;
43 void DidFailProvisionalLoadWithError( 43 void DidFailProvisionalLoadWithError(
44 RenderFrameHostImpl* render_frame_host, 44 RenderFrameHostImpl* render_frame_host,
45 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) 45 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params)
46 override; 46 override;
47 void DidFailLoadWithError(RenderFrameHostImpl* render_frame_host, 47 void DidFailLoadWithError(RenderFrameHostImpl* render_frame_host,
48 const GURL& url, 48 const GURL& url,
49 int error_code, 49 int error_code,
50 const base::string16& error_description) override; 50 const base::string16& error_description) override;
51 void DidNavigate(RenderFrameHostImpl* render_frame_host, 51 void DidNavigate(RenderFrameHostImpl* render_frame_host,
52 int32 page_id,
52 const FrameHostMsg_DidCommitProvisionalLoad_Params& 53 const FrameHostMsg_DidCommitProvisionalLoad_Params&
53 input_params) override; 54 input_params) override;
54 bool NavigateToPendingEntry( 55 bool NavigateToPendingEntry(
55 RenderFrameHostImpl* render_frame_host, 56 RenderFrameHostImpl* render_frame_host,
56 NavigationController::ReloadType reload_type) override; 57 NavigationController::ReloadType reload_type) override;
57 void RequestOpenURL(RenderFrameHostImpl* render_frame_host, 58 void RequestOpenURL(RenderFrameHostImpl* render_frame_host,
58 const GURL& url, 59 const GURL& url,
59 const Referrer& referrer, 60 const Referrer& referrer,
60 WindowOpenDisposition disposition, 61 WindowOpenDisposition disposition,
61 bool should_replace_current_entry, 62 bool should_replace_current_entry,
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 // different FrameTreeNodes, based on the frame_tree_node_id. 132 // different FrameTreeNodes, based on the frame_tree_node_id.
132 typedef base::ScopedPtrHashMap<int64, NavigationRequest> NavigationRequestMap; 133 typedef base::ScopedPtrHashMap<int64, NavigationRequest> NavigationRequestMap;
133 NavigationRequestMap navigation_request_map_; 134 NavigationRequestMap navigation_request_map_;
134 135
135 DISALLOW_COPY_AND_ASSIGN(NavigatorImpl); 136 DISALLOW_COPY_AND_ASSIGN(NavigatorImpl);
136 }; 137 };
137 138
138 } // namespace content 139 } // namespace content
139 140
140 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_ 141 #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