Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(493)

Side by Side Diff: ios/web/navigation/session_storage_builder.mm

Issue 2737203002: Remove CRWSessionEntry. (Closed)
Patch Set: fix XCode-clang build Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 30 matching lines...) Expand all
41 serialized_navigation_manager.openedByDOM = session_controller.openedByDOM; 41 serialized_navigation_manager.openedByDOM = session_controller.openedByDOM;
42 serialized_navigation_manager.currentNavigationIndex = 42 serialized_navigation_manager.currentNavigationIndex =
43 session_controller.currentNavigationIndex; 43 session_controller.currentNavigationIndex;
44 serialized_navigation_manager.previousNavigationIndex = 44 serialized_navigation_manager.previousNavigationIndex =
45 session_controller.previousNavigationIndex; 45 session_controller.previousNavigationIndex;
46 serialized_navigation_manager.sessionCertificatePolicyManager = 46 serialized_navigation_manager.sessionCertificatePolicyManager =
47 session_controller.sessionCertificatePolicyManager; 47 session_controller.sessionCertificatePolicyManager;
48 NSMutableArray* item_storages = [[NSMutableArray alloc] init]; 48 NSMutableArray* item_storages = [[NSMutableArray alloc] init];
49 NavigationItemStorageBuilder item_storage_builder; 49 NavigationItemStorageBuilder item_storage_builder;
50 for (size_t index = 0; index < session_controller.items.size(); ++index) { 50 for (size_t index = 0; index < session_controller.items.size(); ++index) {
51 web::NavigationItemImpl* item = 51 web::NavigationItemImpl* item = session_controller.items[index].get();
52 static_cast<web::NavigationItemImpl*>(session_controller.items[index]);
53 [item_storages addObject:item_storage_builder.BuildStorage(item)]; 52 [item_storages addObject:item_storage_builder.BuildStorage(item)];
54 } 53 }
55 serialized_navigation_manager.itemStorages = item_storages; 54 serialized_navigation_manager.itemStorages = item_storages;
56 web::SerializableUserDataManager* user_data_manager = 55 web::SerializableUserDataManager* user_data_manager =
57 web::SerializableUserDataManager::FromWebState(web_state); 56 web::SerializableUserDataManager::FromWebState(web_state);
58 [serialized_navigation_manager 57 [serialized_navigation_manager
59 setSerializableUserData:user_data_manager->CreateSerializableUserData()]; 58 setSerializableUserData:user_data_manager->CreateSerializableUserData()];
60 return serialized_navigation_manager; 59 return serialized_navigation_manager;
61 } 60 }
62 61
(...skipping 21 matching lines...) Expand all
84 [session_controller 83 [session_controller
85 setSessionCertificatePolicyManager:storage 84 setSessionCertificatePolicyManager:storage
86 .sessionCertificatePolicyManager]; 85 .sessionCertificatePolicyManager];
87 web_state->navigation_manager_.reset(new NavigationManagerImpl()); 86 web_state->navigation_manager_.reset(new NavigationManagerImpl());
88 web_state->navigation_manager_->SetSessionController(session_controller); 87 web_state->navigation_manager_->SetSessionController(session_controller);
89 web::SerializableUserDataManager::FromWebState(web_state) 88 web::SerializableUserDataManager::FromWebState(web_state)
90 ->AddSerializableUserData(storage.userData); 89 ->AddSerializableUserData(storage.userData);
91 } 90 }
92 91
93 } // namespace web 92 } // namespace web
OLDNEW
« no previous file with comments | « ios/web/navigation/navigation_manager_impl.mm ('k') | ios/web/public/web_state/ui/crw_web_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698