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

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

Issue 1002953004: Ensure we properly set PageTransition for iframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 void DidNavigate(RenderFrameHostImpl* render_frame_host, 49 void DidNavigate(RenderFrameHostImpl* render_frame_host,
50 const FrameHostMsg_DidCommitProvisionalLoad_Params& 50 const FrameHostMsg_DidCommitProvisionalLoad_Params&
51 input_params) override; 51 input_params) override;
52 bool NavigateToPendingEntry( 52 bool NavigateToPendingEntry(
53 FrameTreeNode* frame_tree_node, 53 FrameTreeNode* frame_tree_node,
54 NavigationController::ReloadType reload_type) override; 54 NavigationController::ReloadType reload_type) override;
55 void RequestOpenURL(RenderFrameHostImpl* render_frame_host, 55 void RequestOpenURL(RenderFrameHostImpl* render_frame_host,
56 const GURL& url, 56 const GURL& url,
57 SiteInstance* source_site_instance, 57 SiteInstance* source_site_instance,
58 const Referrer& referrer, 58 const Referrer& referrer,
59 ui::PageTransition page_transition,
59 WindowOpenDisposition disposition, 60 WindowOpenDisposition disposition,
60 bool should_replace_current_entry, 61 bool should_replace_current_entry,
61 bool user_gesture) override; 62 bool user_gesture) override;
62 void RequestTransferURL(RenderFrameHostImpl* render_frame_host, 63 void RequestTransferURL(RenderFrameHostImpl* render_frame_host,
63 const GURL& url, 64 const GURL& url,
64 SiteInstance* source_site_instance, 65 SiteInstance* source_site_instance,
65 const std::vector<GURL>& redirect_chain, 66 const std::vector<GURL>& redirect_chain,
66 const Referrer& referrer, 67 const Referrer& referrer,
67 ui::PageTransition page_transition, 68 ui::PageTransition page_transition,
68 WindowOpenDisposition disposition, 69 WindowOpenDisposition disposition,
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 // different FrameTreeNodes, based on the frame_tree_node_id. 147 // different FrameTreeNodes, based on the frame_tree_node_id.
147 typedef base::ScopedPtrHashMap<int64, NavigationRequest> NavigationRequestMap; 148 typedef base::ScopedPtrHashMap<int64, NavigationRequest> NavigationRequestMap;
148 NavigationRequestMap navigation_request_map_; 149 NavigationRequestMap navigation_request_map_;
149 150
150 DISALLOW_COPY_AND_ASSIGN(NavigatorImpl); 151 DISALLOW_COPY_AND_ASSIGN(NavigatorImpl);
151 }; 152 };
152 153
153 } // namespace content 154 } // namespace content
154 155
155 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_ 156 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698