| OLD | NEW |
|---|
| (Empty) |
| 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 | |
| 3 // found in the LICENSE file. | |
| 4 | |
| 5 #import "ios/web/navigation/navigation_manager_storage_builder.h" | |
| 6 | |
| 7 #include "base/logging.h" | |
| 8 #include "base/mac/foundation_util.h" | |
| 9 #import "ios/web/navigation/crw_session_controller.h" | |
| 10 #include "ios/web/navigation/navigation_manager_impl.h" | |
| 11 #import "ios/web/public/crw_navigation_manager_storage.h" | |
| 12 | |
| 13 // CRWSessionController's readonly properties redefined as readwrite. These | |
| 14 // will be removed and NavigationManagerImpl's ivars will be written directly | |
| 15 // as this functionality moves from CRWSessionController to | |
| 16 // NavigationManagerImpl; | |
| 17 @interface CRWSessionController (ExposedForSerialization) | |
| 18 @property(nonatomic, readwrite, retain) NSString* tabId; | |
| 19 @property(nonatomic, readwrite, copy) NSString* openerId; | |
| 20 @property(nonatomic, readwrite, getter=isOpenedByDOM) BOOL openedByDOM; | |
| 21 @property(nonatomic, readwrite, assign) NSInteger openerNavigationIndex; | |
| 22 @property(nonatomic, readwrite, assign) NSInteger currentNavigationIndex; | |
| 23 @property(nonatomic, readwrite, assign) NSInteger previousNavigationIndex; | |
| 24 @property(nonatomic, readwrite, retain) NSArray* entries; | |
| 25 @property(nonatomic, readwrite, retain) | |
| 26 CRWSessionCertificatePolicyManager* sessionCertificatePolicyManager; | |
| 27 @end | |
| 28 | |
| 29 namespace web { | |
| 30 | |
| 31 CRWNavigationManagerStorage* | |
| 32 NavigationManagerStorageBuilder::BuildSerialization( | |
| 33 NavigationManagerImpl* navigation_manager) const { | |
| 34 DCHECK(navigation_manager); | |
| 35 CRWNavigationManagerStorage* serialized_navigation_manager = | |
| 36 [[CRWNavigationManagerStorage alloc] init]; | |
| 37 CRWSessionController* session_controller = | |
| 38 navigation_manager->GetSessionController(); | |
| 39 serialized_navigation_manager.tabID = session_controller.tabId; | |
| 40 serialized_navigation_manager.openerID = session_controller.openerId; | |
| 41 serialized_navigation_manager.openedByDOM = session_controller.openedByDOM; | |
| 42 serialized_navigation_manager.openerNavigationIndex = | |
| 43 session_controller.openerNavigationIndex; | |
| 44 serialized_navigation_manager.windowName = session_controller.windowName; | |
| 45 serialized_navigation_manager.currentNavigationIndex = | |
| 46 session_controller.currentNavigationIndex; | |
| 47 serialized_navigation_manager.previousNavigationIndex = | |
| 48 session_controller.previousNavigationIndex; | |
| 49 serialized_navigation_manager.lastVisitedTimestamp = | |
| 50 session_controller.lastVisitedTimestamp; | |
| 51 serialized_navigation_manager.entries = session_controller.entries; | |
| 52 serialized_navigation_manager.sessionCertificatePolicyManager = | |
| 53 session_controller.sessionCertificatePolicyManager; | |
| 54 return serialized_navigation_manager; | |
| 55 } | |
| 56 | |
| 57 std::unique_ptr<NavigationManagerImpl> | |
| 58 NavigationManagerStorageBuilder::BuildNavigationManagerImpl( | |
| 59 CRWNavigationManagerStorage* navigation_manager_serialization) const { | |
| 60 DCHECK(navigation_manager_serialization); | |
| 61 base::scoped_nsobject<CRWSessionController> session_controller( | |
| 62 [[CRWSessionController alloc] init]); | |
| 63 [session_controller setTabId:navigation_manager_serialization.tabID]; | |
| 64 [session_controller setOpenerId:navigation_manager_serialization.openerID]; | |
| 65 [session_controller | |
| 66 setOpenedByDOM:navigation_manager_serialization.openedByDOM]; | |
| 67 [session_controller setOpenerNavigationIndex:navigation_manager_serialization | |
| 68 .openerNavigationIndex]; | |
| 69 [session_controller | |
| 70 setWindowName:navigation_manager_serialization.windowName]; | |
| 71 [session_controller setCurrentNavigationIndex:navigation_manager_serialization | |
| 72 .currentNavigationIndex]; | |
| 73 [session_controller | |
| 74 setPreviousNavigationIndex:navigation_manager_serialization | |
| 75 .previousNavigationIndex]; | |
| 76 [session_controller setLastVisitedTimestamp:navigation_manager_serialization | |
| 77 .lastVisitedTimestamp]; | |
| 78 [session_controller setEntries:navigation_manager_serialization.entries]; | |
| 79 [session_controller | |
| 80 setSessionCertificatePolicyManager:navigation_manager_serialization | |
| 81 .sessionCertificatePolicyManager]; | |
| 82 std::unique_ptr<NavigationManagerImpl> navigation_manager( | |
| 83 new NavigationManagerImpl()); | |
| 84 navigation_manager->SetSessionController(session_controller); | |
| 85 return navigation_manager; | |
| 86 } | |
| 87 | |
| 88 } // namespace web | |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2655253002:
Revert of Moved NavigationManagerImpl serialization out of CRWSessionController. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master