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

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

Issue 1108863002: Revert "Ensure we properly set PageTransition for iframes." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge 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 | « no previous file | content/browser/frame_host/navigator_impl.h » ('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/browser/frame_host/navigator_delegate.h" 10 #include "content/browser/frame_host/navigator_delegate.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 // Navigation requests ------------------------------------------------------- 94 // Navigation requests -------------------------------------------------------
95 95
96 virtual base::TimeTicks GetCurrentLoadStart(); 96 virtual base::TimeTicks GetCurrentLoadStart();
97 97
98 // The RenderFrameHostImpl has received a request to open a URL with the 98 // The RenderFrameHostImpl has received a request to open a URL with the
99 // specified |disposition|. 99 // specified |disposition|.
100 virtual void RequestOpenURL(RenderFrameHostImpl* render_frame_host, 100 virtual void RequestOpenURL(RenderFrameHostImpl* render_frame_host,
101 const GURL& url, 101 const GURL& url,
102 SiteInstance* source_site_instance, 102 SiteInstance* source_site_instance,
103 const Referrer& referrer, 103 const Referrer& referrer,
104 ui::PageTransition page_transition,
105 WindowOpenDisposition disposition, 104 WindowOpenDisposition disposition,
106 bool should_replace_current_entry, 105 bool should_replace_current_entry,
107 bool user_gesture) {} 106 bool user_gesture) {}
108 107
109 // The RenderFrameHostImpl wants to transfer the request to a new renderer. 108 // The RenderFrameHostImpl wants to transfer the request to a new renderer.
110 // |redirect_chain| contains any redirect URLs (excluding |url|) that happened 109 // |redirect_chain| contains any redirect URLs (excluding |url|) that happened
111 // before the transfer. 110 // before the transfer.
112 virtual void RequestTransferURL( 111 virtual void RequestTransferURL(
113 RenderFrameHostImpl* render_frame_host, 112 RenderFrameHostImpl* render_frame_host,
114 const GURL& url, 113 const GURL& url,
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 virtual bool IsWaitingForBeforeUnloadACK(FrameTreeNode* frame_tree_node); 179 virtual bool IsWaitingForBeforeUnloadACK(FrameTreeNode* frame_tree_node);
181 180
182 protected: 181 protected:
183 friend class base::RefCounted<Navigator>; 182 friend class base::RefCounted<Navigator>;
184 virtual ~Navigator() {} 183 virtual ~Navigator() {}
185 }; 184 };
186 185
187 } // namespace content 186 } // namespace content
188 187
189 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_H_ 188 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/frame_host/navigator_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698