OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "services/navigation/view_impl.h" | 5 #include "services/navigation/view_impl.h" |
6 | 6 |
7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "content/public/browser/browser_context.h" | 9 #include "content/public/browser/browser_context.h" |
10 #include "content/public/browser/interstitial_page.h" | 10 #include "content/public/browser/interstitial_page.h" |
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
233 } | 233 } |
234 case content::NOTIFICATION_NAV_ENTRY_COMMITTED: { | 234 case content::NOTIFICATION_NAV_ENTRY_COMMITTED: { |
235 const content::LoadCommittedDetails* lcd = | 235 const content::LoadCommittedDetails* lcd = |
236 content::Details<content::LoadCommittedDetails>(details).ptr(); | 236 content::Details<content::LoadCommittedDetails>(details).ptr(); |
237 mojom::NavigationCommittedDetailsPtr details_ptr( | 237 mojom::NavigationCommittedDetailsPtr details_ptr( |
238 mojom::NavigationCommittedDetails::New()); | 238 mojom::NavigationCommittedDetails::New()); |
239 details_ptr->entry = lcd->entry->GetUniqueID(); | 239 details_ptr->entry = lcd->entry->GetUniqueID(); |
240 details_ptr->type = static_cast<mojom::NavigationType>(lcd->type); | 240 details_ptr->type = static_cast<mojom::NavigationType>(lcd->type); |
241 details_ptr->previous_entry_index = lcd->previous_entry_index; | 241 details_ptr->previous_entry_index = lcd->previous_entry_index; |
242 details_ptr->previous_url = lcd->previous_url; | 242 details_ptr->previous_url = lcd->previous_url; |
243 details_ptr->is_in_page = lcd->is_in_page; | 243 details_ptr->is_in_page = lcd->is_same_document; |
244 details_ptr->is_main_frame = lcd->is_main_frame; | 244 details_ptr->is_main_frame = lcd->is_main_frame; |
245 details_ptr->http_status_code = lcd->http_status_code; | 245 details_ptr->http_status_code = lcd->http_status_code; |
246 client_->NavigationCommitted( | 246 client_->NavigationCommitted( |
247 std::move(details_ptr), | 247 std::move(details_ptr), |
248 web_view_->GetWebContents()->GetController().GetCurrentEntryIndex()); | 248 web_view_->GetWebContents()->GetController().GetCurrentEntryIndex()); |
249 break; | 249 break; |
250 } | 250 } |
251 case content::NOTIFICATION_NAV_ENTRY_CHANGED: { | 251 case content::NOTIFICATION_NAV_ENTRY_CHANGED: { |
252 const content::EntryChangedDetails* ecd = | 252 const content::EntryChangedDetails* ecd = |
253 content::Details<content::EntryChangedDetails>(details).ptr(); | 253 content::Details<content::EntryChangedDetails>(details).ptr(); |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
311 | 311 |
312 views::Widget* ViewImpl::GetWidget() { | 312 views::Widget* ViewImpl::GetWidget() { |
313 return web_view_->GetWidget(); | 313 return web_view_->GetWidget(); |
314 } | 314 } |
315 | 315 |
316 const views::Widget* ViewImpl::GetWidget() const { | 316 const views::Widget* ViewImpl::GetWidget() const { |
317 return web_view_->GetWidget(); | 317 return web_view_->GetWidget(); |
318 } | 318 } |
319 | 319 |
320 } // navigation | 320 } // navigation |
OLD | NEW |