OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #include "chrome/browser/renderer_host/transfer_navigation_resource_handler.h" | 5 #include "chrome/browser/renderer_host/transfer_navigation_resource_handler.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "chrome/browser/profiles/profile_io_data.h" | 8 #include "chrome/browser/profiles/profile_io_data.h" |
9 #include "chrome/browser/extensions/extension_info_map.h" | 9 #include "chrome/browser/extensions/extension_info_map.h" |
10 #include "content/browser/renderer_host/render_view_host.h" | 10 #include "content/browser/renderer_host/render_view_host.h" |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 bool old_url_is_hosted_app = old_url_extension && | 45 bool old_url_is_hosted_app = old_url_extension && |
46 !old_url_extension->web_extent().is_empty(); | 46 !old_url_extension->web_extent().is_empty(); |
47 if (old_url_is_hosted_app) | 47 if (old_url_is_hosted_app) |
48 return false; | 48 return false; |
49 | 49 |
50 return old_url_extension != new_url_extension; | 50 return old_url_extension != new_url_extension; |
51 } | 51 } |
52 | 52 |
53 void RequestTransferURLOnUIThread(int render_process_id, | 53 void RequestTransferURLOnUIThread(int render_process_id, |
54 int render_view_id, | 54 int render_view_id, |
55 GURL new_url, | 55 const GURL& new_url, |
56 GURL referrer, | 56 const content::Referrer& referrer, |
57 WindowOpenDisposition window_open_disposition, | 57 WindowOpenDisposition window_open_disposition, |
58 int64 frame_id, | 58 int64 frame_id, |
59 const GlobalRequestID& request_id) { | 59 const GlobalRequestID& request_id) { |
60 RenderViewHost* rvh = RenderViewHost::FromID(render_process_id, | 60 RenderViewHost* rvh = RenderViewHost::FromID(render_process_id, |
61 render_view_id); | 61 render_view_id); |
62 if (!rvh) | 62 if (!rvh) |
63 return; | 63 return; |
64 | 64 |
65 RenderViewHostDelegate* delegate = rvh->delegate(); | 65 RenderViewHostDelegate* delegate = rvh->delegate(); |
66 if (!delegate) | 66 if (!delegate) |
67 return; | 67 return; |
68 | 68 |
69 delegate->RequestTransferURL( | 69 delegate->RequestTransferURL( |
70 new_url, content::Referrer(referrer, WebKit::WebReferrerPolicyDefault), | 70 new_url, referrer, |
71 window_open_disposition, frame_id, request_id); | 71 window_open_disposition, frame_id, request_id); |
72 } | 72 } |
73 | 73 |
74 } // namespace | 74 } // namespace |
75 | 75 |
76 TransferNavigationResourceHandler::TransferNavigationResourceHandler( | 76 TransferNavigationResourceHandler::TransferNavigationResourceHandler( |
77 ResourceHandler* handler, | 77 ResourceHandler* handler, |
78 ResourceDispatcherHost* resource_dispatcher_host, | 78 ResourceDispatcherHost* resource_dispatcher_host, |
79 net::URLRequest* request) | 79 net::URLRequest* request) |
80 : next_handler_(handler), | 80 : next_handler_(handler), |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 request_, &render_process_id, &render_view_id)) { | 117 request_, &render_process_id, &render_view_id)) { |
118 | 118 |
119 GlobalRequestID global_id(info->child_id(), info->request_id()); | 119 GlobalRequestID global_id(info->child_id(), info->request_id()); |
120 rdh_->MarkAsTransferredNavigation(global_id, request_); | 120 rdh_->MarkAsTransferredNavigation(global_id, request_); |
121 | 121 |
122 content::BrowserThread::PostTask( | 122 content::BrowserThread::PostTask( |
123 content::BrowserThread::UI, | 123 content::BrowserThread::UI, |
124 FROM_HERE, | 124 FROM_HERE, |
125 base::Bind(&RequestTransferURLOnUIThread, | 125 base::Bind(&RequestTransferURLOnUIThread, |
126 render_process_id, render_view_id, | 126 render_process_id, render_view_id, |
127 new_url, GURL(request_->referrer()), CURRENT_TAB, | 127 new_url, |
128 info->frame_id(), global_id)); | 128 content::Referrer(GURL(request_->referrer()), |
| 129 info->referrer_policy()), |
| 130 CURRENT_TAB, info->frame_id(), global_id)); |
129 | 131 |
130 *defer = true; | 132 *defer = true; |
131 return true; | 133 return true; |
132 } | 134 } |
133 } | 135 } |
134 | 136 |
135 return next_handler_->OnRequestRedirected( | 137 return next_handler_->OnRequestRedirected( |
136 request_id, new_url, response, defer); | 138 request_id, new_url, response, defer); |
137 } | 139 } |
138 | 140 |
(...skipping 23 matching lines...) Expand all Loading... |
162 bool TransferNavigationResourceHandler::OnResponseCompleted( | 164 bool TransferNavigationResourceHandler::OnResponseCompleted( |
163 int request_id, | 165 int request_id, |
164 const net::URLRequestStatus& status, | 166 const net::URLRequestStatus& status, |
165 const std::string& security_info) { | 167 const std::string& security_info) { |
166 return next_handler_->OnResponseCompleted(request_id, status, security_info); | 168 return next_handler_->OnResponseCompleted(request_id, status, security_info); |
167 } | 169 } |
168 | 170 |
169 void TransferNavigationResourceHandler::OnRequestClosed() { | 171 void TransferNavigationResourceHandler::OnRequestClosed() { |
170 next_handler_->OnRequestClosed(); | 172 next_handler_->OnRequestClosed(); |
171 } | 173 } |
OLD | NEW |