| 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 <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/mac/foundation_util.h" | 10 #include "base/mac/foundation_util.h" |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 items[index] = std::move(item_impl); | 83 items[index] = std::move(item_impl); |
| 84 } | 84 } |
| 85 NSUInteger last_committed_item_index = storage.lastCommittedItemIndex; | 85 NSUInteger last_committed_item_index = storage.lastCommittedItemIndex; |
| 86 base::scoped_nsobject<CRWSessionController> session_controller( | 86 base::scoped_nsobject<CRWSessionController> session_controller( |
| 87 [[CRWSessionController alloc] | 87 [[CRWSessionController alloc] |
| 88 initWithBrowserState:nullptr | 88 initWithBrowserState:nullptr |
| 89 navigationItems:std::move(items) | 89 navigationItems:std::move(items) |
| 90 lastCommittedItemIndex:last_committed_item_index]); | 90 lastCommittedItemIndex:last_committed_item_index]); |
| 91 [session_controller setPreviousItemIndex:storage.previousItemIndex]; | 91 [session_controller setPreviousItemIndex:storage.previousItemIndex]; |
| 92 | 92 |
| 93 auto navigation_manager = base::MakeUnique<LegacyNavigationManagerImpl>(); | 93 web_state->navigation_manager_->SetSessionController(session_controller); |
| 94 navigation_manager->SetSessionController(session_controller); | |
| 95 web_state->navigation_manager_.reset(navigation_manager.release()); | |
| 96 | 94 |
| 97 SessionCertificatePolicyCacheStorageBuilder cert_builder; | 95 SessionCertificatePolicyCacheStorageBuilder cert_builder; |
| 98 std::unique_ptr<SessionCertificatePolicyCacheImpl> cert_policy_cache = | 96 std::unique_ptr<SessionCertificatePolicyCacheImpl> cert_policy_cache = |
| 99 cert_builder.BuildSessionCertificatePolicyCache( | 97 cert_builder.BuildSessionCertificatePolicyCache( |
| 100 storage.certPolicyCacheStorage); | 98 storage.certPolicyCacheStorage); |
| 101 if (!cert_policy_cache) | 99 if (!cert_policy_cache) |
| 102 cert_policy_cache = base::MakeUnique<SessionCertificatePolicyCacheImpl>(); | 100 cert_policy_cache = base::MakeUnique<SessionCertificatePolicyCacheImpl>(); |
| 103 web_state->certificate_policy_cache_ = std::move(cert_policy_cache); | 101 web_state->certificate_policy_cache_ = std::move(cert_policy_cache); |
| 104 web::SerializableUserDataManager::FromWebState(web_state) | 102 web::SerializableUserDataManager::FromWebState(web_state) |
| 105 ->AddSerializableUserData(storage.userData); | 103 ->AddSerializableUserData(storage.userData); |
| 106 } | 104 } |
| 107 | 105 |
| 108 } // namespace web | 106 } // namespace web |
| OLD | NEW |