| 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 session_controller.currentNavigationIndex; | 52 session_controller.currentNavigationIndex; |
| 53 serialized_navigation_manager.previousNavigationIndex = | 53 serialized_navigation_manager.previousNavigationIndex = |
| 54 session_controller.previousNavigationIndex; | 54 session_controller.previousNavigationIndex; |
| 55 serialized_navigation_manager.lastVisitedTimestamp = | 55 serialized_navigation_manager.lastVisitedTimestamp = |
| 56 session_controller.lastVisitedTimestamp; | 56 session_controller.lastVisitedTimestamp; |
| 57 serialized_navigation_manager.sessionCertificatePolicyManager = | 57 serialized_navigation_manager.sessionCertificatePolicyManager = |
| 58 session_controller.sessionCertificatePolicyManager; | 58 session_controller.sessionCertificatePolicyManager; |
| 59 NSMutableArray* item_storages = [[NSMutableArray alloc] init]; | 59 NSMutableArray* item_storages = [[NSMutableArray alloc] init]; |
| 60 NavigationItemStorageBuilder item_storage_builder; | 60 NavigationItemStorageBuilder item_storage_builder; |
| 61 for (size_t index = 0; index < session_controller.items.size(); ++index) { | 61 for (size_t index = 0; index < session_controller.items.size(); ++index) { |
| 62 web::NavigationItemImpl* item = session_controller.items[index].get(); | 62 web::NavigationItemImpl* item = |
| 63 static_cast<web::NavigationItemImpl*>(session_controller.items[index]); |
| 63 [item_storages addObject:item_storage_builder.BuildStorage(item)]; | 64 [item_storages addObject:item_storage_builder.BuildStorage(item)]; |
| 64 } | 65 } |
| 65 serialized_navigation_manager.itemStorages = item_storages; | 66 serialized_navigation_manager.itemStorages = item_storages; |
| 66 web::SerializableUserDataManager* user_data_manager = | 67 web::SerializableUserDataManager* user_data_manager = |
| 67 web::SerializableUserDataManager::FromWebState(web_state); | 68 web::SerializableUserDataManager::FromWebState(web_state); |
| 68 [serialized_navigation_manager | 69 [serialized_navigation_manager |
| 69 setSerializableUserData:user_data_manager->CreateSerializableUserData()]; | 70 setSerializableUserData:user_data_manager->CreateSerializableUserData()]; |
| 70 return serialized_navigation_manager; | 71 return serialized_navigation_manager; |
| 71 } | 72 } |
| 72 | 73 |
| (...skipping 26 matching lines...) Expand all Loading... |
| 99 [session_controller | 100 [session_controller |
| 100 setSessionCertificatePolicyManager:storage | 101 setSessionCertificatePolicyManager:storage |
| 101 .sessionCertificatePolicyManager]; | 102 .sessionCertificatePolicyManager]; |
| 102 web_state->navigation_manager_.reset(new NavigationManagerImpl()); | 103 web_state->navigation_manager_.reset(new NavigationManagerImpl()); |
| 103 web_state->navigation_manager_->SetSessionController(session_controller); | 104 web_state->navigation_manager_->SetSessionController(session_controller); |
| 104 web::SerializableUserDataManager::FromWebState(web_state) | 105 web::SerializableUserDataManager::FromWebState(web_state) |
| 105 ->AddSerializableUserData(storage.userData); | 106 ->AddSerializableUserData(storage.userData); |
| 106 } | 107 } |
| 107 | 108 |
| 108 } // namespace web | 109 } // namespace web |
| OLD | NEW |