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

Side by Side Diff: content/browser/frame_host/navigator_impl.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, 7 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 void DidNavigate(RenderFrameHostImpl* render_frame_host, 50 void DidNavigate(RenderFrameHostImpl* render_frame_host,
51 const FrameHostMsg_DidCommitProvisionalLoad_Params& 51 const FrameHostMsg_DidCommitProvisionalLoad_Params&
52 input_params) override; 52 input_params) override;
53 bool NavigateToPendingEntry( 53 bool NavigateToPendingEntry(
54 FrameTreeNode* frame_tree_node, 54 FrameTreeNode* frame_tree_node,
55 NavigationController::ReloadType reload_type) override; 55 NavigationController::ReloadType reload_type) override;
56 void RequestOpenURL(RenderFrameHostImpl* render_frame_host, 56 void RequestOpenURL(RenderFrameHostImpl* render_frame_host,
57 const GURL& url, 57 const GURL& url,
58 SiteInstance* source_site_instance, 58 SiteInstance* source_site_instance,
59 const Referrer& referrer, 59 const Referrer& referrer,
60 ui::PageTransition page_transition,
61 WindowOpenDisposition disposition, 60 WindowOpenDisposition disposition,
62 bool should_replace_current_entry, 61 bool should_replace_current_entry,
63 bool user_gesture) override; 62 bool user_gesture) override;
64 void RequestTransferURL(RenderFrameHostImpl* render_frame_host, 63 void RequestTransferURL(RenderFrameHostImpl* render_frame_host,
65 const GURL& url, 64 const GURL& url,
66 SiteInstance* source_site_instance, 65 SiteInstance* source_site_instance,
67 const std::vector<GURL>& redirect_chain, 66 const std::vector<GURL>& redirect_chain,
68 const Referrer& referrer, 67 const Referrer& referrer,
69 ui::PageTransition page_transition, 68 ui::PageTransition page_transition,
70 WindowOpenDisposition disposition, 69 WindowOpenDisposition disposition,
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 NavigatorDelegate* delegate_; 137 NavigatorDelegate* delegate_;
139 138
140 scoped_ptr<NavigatorImpl::NavigationMetricsData> navigation_data_; 139 scoped_ptr<NavigatorImpl::NavigationMetricsData> navigation_data_;
141 140
142 DISALLOW_COPY_AND_ASSIGN(NavigatorImpl); 141 DISALLOW_COPY_AND_ASSIGN(NavigatorImpl);
143 }; 142 };
144 143
145 } // namespace content 144 } // namespace content
146 145
147 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_ 146 #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