OLD | NEW |
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 #include "content/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 4140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4151 } else { | 4151 } else { |
4152 params.page_state = PageState::CreateFromURL(request.url()); | 4152 params.page_state = PageState::CreateFromURL(request.url()); |
4153 } | 4153 } |
4154 } else { | 4154 } else { |
4155 // In --site-per-process, just send a single HistoryItem for this frame, | 4155 // In --site-per-process, just send a single HistoryItem for this frame, |
4156 // rather than the whole tree. It will be stored in the corresponding | 4156 // rather than the whole tree. It will be stored in the corresponding |
4157 // FrameNavigationEntry. | 4157 // FrameNavigationEntry. |
4158 params.page_state = SingleHistoryItemToPageState(item); | 4158 params.page_state = SingleHistoryItemToPageState(item); |
4159 post_id = ExtractPostId(item); | 4159 post_id = ExtractPostId(item); |
4160 } | 4160 } |
| 4161 params.frame_unique_name = item.target().utf8(); |
4161 params.item_sequence_number = item.itemSequenceNumber(); | 4162 params.item_sequence_number = item.itemSequenceNumber(); |
4162 params.document_sequence_number = item.documentSequenceNumber(); | 4163 params.document_sequence_number = item.documentSequenceNumber(); |
4163 | 4164 |
4164 if (!frame->parent()) { | 4165 if (!frame->parent()) { |
4165 // Top-level navigation. | 4166 // Top-level navigation. |
4166 | 4167 |
4167 // Reset the zoom limits in case a plugin had changed them previously. This | 4168 // Reset the zoom limits in case a plugin had changed them previously. This |
4168 // will also call us back which will cause us to send a message to | 4169 // will also call us back which will cause us to send a message to |
4169 // update WebContentsImpl. | 4170 // update WebContentsImpl. |
4170 render_view_->webview()->zoomLimitsChanged( | 4171 render_view_->webview()->zoomLimitsChanged( |
(...skipping 1159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5330 mojo::ServiceProviderPtr service_provider; | 5331 mojo::ServiceProviderPtr service_provider; |
5331 mojo::URLRequestPtr request(mojo::URLRequest::New()); | 5332 mojo::URLRequestPtr request(mojo::URLRequest::New()); |
5332 request->url = mojo::String::From(url); | 5333 request->url = mojo::String::From(url); |
5333 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), | 5334 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), |
5334 nullptr, nullptr, | 5335 nullptr, nullptr, |
5335 base::Bind(&OnGotContentHandlerID)); | 5336 base::Bind(&OnGotContentHandlerID)); |
5336 return service_provider.Pass(); | 5337 return service_provider.Pass(); |
5337 } | 5338 } |
5338 | 5339 |
5339 } // namespace content | 5340 } // namespace content |
OLD | NEW |