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

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

Issue 743773003: OOPIF: Data URLs are now rendered in the renderer that initiated the navigation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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 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 const FrameHostMsg_DidCommitProvisionalLoad_Params& 52 const FrameHostMsg_DidCommitProvisionalLoad_Params&
53 input_params) override; 53 input_params) override;
54 bool NavigateToPendingEntry( 54 bool NavigateToPendingEntry(
55 RenderFrameHostImpl* render_frame_host, 55 RenderFrameHostImpl* render_frame_host,
56 NavigationController::ReloadType reload_type) override; 56 NavigationController::ReloadType reload_type) override;
57 void RequestOpenURL(RenderFrameHostImpl* render_frame_host, 57 void RequestOpenURL(RenderFrameHostImpl* render_frame_host,
58 const GURL& url, 58 const GURL& url,
59 SiteInstance* source_site_instance,
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,
62 bool user_gesture) override; 63 bool user_gesture) override;
63 void RequestTransferURL(RenderFrameHostImpl* render_frame_host, 64 void RequestTransferURL(RenderFrameHostImpl* render_frame_host,
64 const GURL& url, 65 const GURL& url,
66 SiteInstance* source_site_instance,
65 const std::vector<GURL>& redirect_chain, 67 const std::vector<GURL>& redirect_chain,
66 const Referrer& referrer, 68 const Referrer& referrer,
67 ui::PageTransition page_transition, 69 ui::PageTransition page_transition,
68 WindowOpenDisposition disposition, 70 WindowOpenDisposition disposition,
69 const GlobalRequestID& transferred_global_request_id, 71 const GlobalRequestID& transferred_global_request_id,
70 bool should_replace_current_entry, 72 bool should_replace_current_entry,
71 bool user_gesture) override; 73 bool user_gesture) override;
72 void OnBeginNavigation(FrameTreeNode* frame_tree_node, 74 void OnBeginNavigation(FrameTreeNode* frame_tree_node,
73 const FrameHostMsg_BeginNavigation_Params& params, 75 const FrameHostMsg_BeginNavigation_Params& params,
74 const CommonNavigationParams& common_params) override; 76 const CommonNavigationParams& common_params) override;
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 // different FrameTreeNodes, based on the frame_tree_node_id. 138 // different FrameTreeNodes, based on the frame_tree_node_id.
137 typedef base::ScopedPtrHashMap<int64, NavigationRequest> NavigationRequestMap; 139 typedef base::ScopedPtrHashMap<int64, NavigationRequest> NavigationRequestMap;
138 NavigationRequestMap navigation_request_map_; 140 NavigationRequestMap navigation_request_map_;
139 141
140 DISALLOW_COPY_AND_ASSIGN(NavigatorImpl); 142 DISALLOW_COPY_AND_ASSIGN(NavigatorImpl);
141 }; 143 };
142 144
143 } // namespace content 145 } // namespace content
144 146
145 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_ 147 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698