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

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

Issue 941113002: Pass FrameTreeNode (not RenderFrameHost) to NavigateToEntry. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix style 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
« no previous file with comments | « no previous file | content/browser/frame_host/navigator.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_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_H_
6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "content/common/content_export.h" 10 #include "content/common/content_export.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 // The entry has a PageID of -1 if newly created (corresponding to navigation 78 // The entry has a PageID of -1 if newly created (corresponding to navigation
79 // to a new URL). 79 // to a new URL).
80 // 80 //
81 // If this method returns false, then the navigation is discarded (equivalent 81 // If this method returns false, then the navigation is discarded (equivalent
82 // to calling DiscardPendingEntry on the NavigationController). 82 // to calling DiscardPendingEntry on the NavigationController).
83 // 83 //
84 // TODO(nasko): Remove this method from the interface, since Navigator and 84 // TODO(nasko): Remove this method from the interface, since Navigator and
85 // NavigationController know about each other. This will be possible once 85 // NavigationController know about each other. This will be possible once
86 // initialization of Navigator and NavigationController is properly done. 86 // initialization of Navigator and NavigationController is properly done.
87 virtual bool NavigateToPendingEntry( 87 virtual bool NavigateToPendingEntry(
88 RenderFrameHostImpl* render_frame_host, 88 FrameTreeNode* frame_tree_node,
89 NavigationController::ReloadType reload_type); 89 NavigationController::ReloadType reload_type);
90 90
91 91
92 // Navigation requests ------------------------------------------------------- 92 // Navigation requests -------------------------------------------------------
93 93
94 virtual base::TimeTicks GetCurrentLoadStart(); 94 virtual base::TimeTicks GetCurrentLoadStart();
95 95
96 // The RenderFrameHostImpl has received a request to open a URL with the 96 // The RenderFrameHostImpl has received a request to open a URL with the
97 // specified |disposition|. 97 // specified |disposition|.
98 virtual void RequestOpenURL(RenderFrameHostImpl* render_frame_host, 98 virtual void RequestOpenURL(RenderFrameHostImpl* render_frame_host,
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 virtual bool IsWaitingForBeforeUnloadACK(FrameTreeNode* frame_tree_node); 168 virtual bool IsWaitingForBeforeUnloadACK(FrameTreeNode* frame_tree_node);
169 169
170 protected: 170 protected:
171 friend class base::RefCounted<Navigator>; 171 friend class base::RefCounted<Navigator>;
172 virtual ~Navigator() {} 172 virtual ~Navigator() {}
173 }; 173 };
174 174
175 } // namespace content 175 } // namespace content
176 176
177 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_H_ 177 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/frame_host/navigator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698