| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #import "ios/web/navigation/session_storage_builder.h" | 5 #import "ios/web/navigation/session_storage_builder.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/mac/foundation_util.h" | 8 #include "base/mac/foundation_util.h" |
| 9 #import "ios/web/navigation/crw_session_controller+private_constructors.h" | 9 #import "ios/web/navigation/crw_session_controller+private_constructors.h" |
| 10 #import "ios/web/navigation/crw_session_controller.h" | 10 #import "ios/web/navigation/crw_session_controller.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 CRWSessionStorage* SessionStorageBuilder::BuildStorage( | 35 CRWSessionStorage* SessionStorageBuilder::BuildStorage( |
| 36 WebStateImpl* web_state) const { | 36 WebStateImpl* web_state) const { |
| 37 DCHECK(web_state); | 37 DCHECK(web_state); |
| 38 web::NavigationManagerImpl* navigation_manager = | 38 web::NavigationManagerImpl* navigation_manager = |
| 39 web_state->navigation_manager_.get(); | 39 web_state->navigation_manager_.get(); |
| 40 DCHECK(navigation_manager); | 40 DCHECK(navigation_manager); |
| 41 CRWSessionStorage* serialized_navigation_manager = | 41 CRWSessionStorage* serialized_navigation_manager = |
| 42 [[CRWSessionStorage alloc] init]; | 42 [[CRWSessionStorage alloc] init]; |
| 43 CRWSessionController* session_controller = | 43 CRWSessionController* session_controller = |
| 44 navigation_manager->GetSessionController(); | 44 navigation_manager->GetSessionController(); |
| 45 serialized_navigation_manager.tabID = session_controller.tabId; | |
| 46 serialized_navigation_manager.openerID = session_controller.openerId; | 45 serialized_navigation_manager.openerID = session_controller.openerId; |
| 47 serialized_navigation_manager.openedByDOM = session_controller.openedByDOM; | 46 serialized_navigation_manager.openedByDOM = session_controller.openedByDOM; |
| 48 serialized_navigation_manager.openerNavigationIndex = | 47 serialized_navigation_manager.openerNavigationIndex = |
| 49 session_controller.openerNavigationIndex; | 48 session_controller.openerNavigationIndex; |
| 50 serialized_navigation_manager.windowName = session_controller.windowName; | 49 serialized_navigation_manager.windowName = session_controller.windowName; |
| 51 serialized_navigation_manager.currentNavigationIndex = | 50 serialized_navigation_manager.currentNavigationIndex = |
| 52 session_controller.currentNavigationIndex; | 51 session_controller.currentNavigationIndex; |
| 53 serialized_navigation_manager.previousNavigationIndex = | 52 serialized_navigation_manager.previousNavigationIndex = |
| 54 session_controller.previousNavigationIndex; | 53 session_controller.previousNavigationIndex; |
| 55 serialized_navigation_manager.lastVisitedTimestamp = | 54 serialized_navigation_manager.lastVisitedTimestamp = |
| (...skipping 26 matching lines...) Expand all Loading... |
| 82 for (size_t index = 0; index < item_storages.count; ++index) { | 81 for (size_t index = 0; index < item_storages.count; ++index) { |
| 83 std::unique_ptr<NavigationItemImpl> item_impl = | 82 std::unique_ptr<NavigationItemImpl> item_impl = |
| 84 item_storage_builder.BuildNavigationItemImpl(item_storages[index]); | 83 item_storage_builder.BuildNavigationItemImpl(item_storages[index]); |
| 85 items[index] = std::move(item_impl); | 84 items[index] = std::move(item_impl); |
| 86 } | 85 } |
| 87 NSUInteger current_index = storage.currentNavigationIndex; | 86 NSUInteger current_index = storage.currentNavigationIndex; |
| 88 base::scoped_nsobject<CRWSessionController> session_controller( | 87 base::scoped_nsobject<CRWSessionController> session_controller( |
| 89 [[CRWSessionController alloc] initWithNavigationItems:std::move(items) | 88 [[CRWSessionController alloc] initWithNavigationItems:std::move(items) |
| 90 currentIndex:current_index | 89 currentIndex:current_index |
| 91 browserState:nullptr]); | 90 browserState:nullptr]); |
| 92 [session_controller setTabId:storage.tabID]; | |
| 93 [session_controller setOpenerId:storage.openerID]; | 91 [session_controller setOpenerId:storage.openerID]; |
| 94 [session_controller setOpenedByDOM:storage.openedByDOM]; | 92 [session_controller setOpenedByDOM:storage.openedByDOM]; |
| 95 [session_controller setOpenerNavigationIndex:storage.openerNavigationIndex]; | 93 [session_controller setOpenerNavigationIndex:storage.openerNavigationIndex]; |
| 96 [session_controller setWindowName:storage.windowName]; | 94 [session_controller setWindowName:storage.windowName]; |
| 97 [session_controller | 95 [session_controller |
| 98 setPreviousNavigationIndex:storage.previousNavigationIndex]; | 96 setPreviousNavigationIndex:storage.previousNavigationIndex]; |
| 99 [session_controller setLastVisitedTimestamp:storage.lastVisitedTimestamp]; | 97 [session_controller setLastVisitedTimestamp:storage.lastVisitedTimestamp]; |
| 100 [session_controller | 98 [session_controller |
| 101 setSessionCertificatePolicyManager:storage | 99 setSessionCertificatePolicyManager:storage |
| 102 .sessionCertificatePolicyManager]; | 100 .sessionCertificatePolicyManager]; |
| 103 web_state->navigation_manager_.reset(new NavigationManagerImpl()); | 101 web_state->navigation_manager_.reset(new NavigationManagerImpl()); |
| 104 web_state->navigation_manager_->SetSessionController(session_controller); | 102 web_state->navigation_manager_->SetSessionController(session_controller); |
| 105 web::SerializableUserDataManager::FromWebState(web_state) | 103 web::SerializableUserDataManager::FromWebState(web_state) |
| 106 ->AddSerializableUserData(storage.userData); | 104 ->AddSerializableUserData(storage.userData); |
| 107 } | 105 } |
| 108 | 106 |
| 109 } // namespace web | 107 } // namespace web |
| OLD | NEW |