| Index: ios/web/navigation/session_storage_builder.mm
|
| diff --git a/ios/web/navigation/session_storage_builder.mm b/ios/web/navigation/session_storage_builder.mm
|
| index 0f932e80d78612534a80d1cf5250c0e012f6064f..002e01b0ab1f94d4f0062f84d608128c1497ec0a 100644
|
| --- a/ios/web/navigation/session_storage_builder.mm
|
| +++ b/ios/web/navigation/session_storage_builder.mm
|
| @@ -20,7 +20,6 @@
|
| // as this functionality moves from CRWSessionController to
|
| // NavigationManagerImpl;
|
| @interface CRWSessionController (ExposedForSerialization)
|
| -@property(nonatomic, readwrite, getter=isOpenedByDOM) BOOL openedByDOM;
|
| @property(nonatomic, readwrite, assign) NSInteger previousNavigationIndex;
|
| @property(nonatomic, readwrite, retain)
|
| CRWSessionCertificatePolicyManager* sessionCertificatePolicyManager;
|
| @@ -34,16 +33,15 @@ @interface CRWSessionController (ExposedForSerialization)
|
| web::NavigationManagerImpl* navigation_manager =
|
| web_state->navigation_manager_.get();
|
| DCHECK(navigation_manager);
|
| - CRWSessionStorage* serialized_navigation_manager =
|
| - [[CRWSessionStorage alloc] init];
|
| + CRWSessionStorage* session_storage = [[CRWSessionStorage alloc] init];
|
| + session_storage.openedByDOM = web_state->IsOpenedByDOM();
|
| CRWSessionController* session_controller =
|
| navigation_manager->GetSessionController();
|
| - serialized_navigation_manager.openedByDOM = session_controller.openedByDOM;
|
| - serialized_navigation_manager.currentNavigationIndex =
|
| + session_storage.currentNavigationIndex =
|
| session_controller.currentNavigationIndex;
|
| - serialized_navigation_manager.previousNavigationIndex =
|
| + session_storage.previousNavigationIndex =
|
| session_controller.previousNavigationIndex;
|
| - serialized_navigation_manager.sessionCertificatePolicyManager =
|
| + session_storage.sessionCertificatePolicyManager =
|
| session_controller.sessionCertificatePolicyManager;
|
| NSMutableArray* item_storages = [[NSMutableArray alloc] init];
|
| NavigationItemStorageBuilder item_storage_builder;
|
| @@ -51,12 +49,12 @@ @interface CRWSessionController (ExposedForSerialization)
|
| web::NavigationItemImpl* item = session_controller.items[index].get();
|
| [item_storages addObject:item_storage_builder.BuildStorage(item)];
|
| }
|
| - serialized_navigation_manager.itemStorages = item_storages;
|
| + session_storage.itemStorages = item_storages;
|
| web::SerializableUserDataManager* user_data_manager =
|
| web::SerializableUserDataManager::FromWebState(web_state);
|
| - [serialized_navigation_manager
|
| + [session_storage
|
| setSerializableUserData:user_data_manager->CreateSerializableUserData()];
|
| - return serialized_navigation_manager;
|
| + return session_storage;
|
| }
|
|
|
| void SessionStorageBuilder::ExtractSessionState(
|
| @@ -64,6 +62,7 @@ @interface CRWSessionController (ExposedForSerialization)
|
| CRWSessionStorage* storage) const {
|
| DCHECK(web_state);
|
| DCHECK(storage);
|
| + web_state->opened_by_dom_ = storage.openedByDOM;
|
| NSArray* item_storages = storage.itemStorages;
|
| web::ScopedNavigationItemList items(item_storages.count);
|
| NavigationItemStorageBuilder item_storage_builder;
|
| @@ -77,7 +76,6 @@ @interface CRWSessionController (ExposedForSerialization)
|
| [[CRWSessionController alloc] initWithBrowserState:nullptr
|
| navigationItems:std::move(items)
|
| currentIndex:current_index]);
|
| - [session_controller setOpenedByDOM:storage.openedByDOM];
|
| [session_controller
|
| setPreviousNavigationIndex:storage.previousNavigationIndex];
|
| [session_controller
|
|
|