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

Unified Diff: ios/web/navigation/session_storage_builder.mm

Issue 2720983002: Remove windowName from CRWSessionController. (Closed)
Patch Set: Address comments. Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
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 ba2ce49e9ccf3b959f3d8efce7c2be1a792cee04..ab27aff25e464cdbcc98ecca9d85c1a9bc4b95d0 100644
--- a/ios/web/navigation/session_storage_builder.mm
+++ b/ios/web/navigation/session_storage_builder.mm
@@ -21,7 +21,6 @@
// as this functionality moves from CRWSessionController to
// NavigationManagerImpl;
@interface CRWSessionController (ExposedForSerialization)
-@property(nonatomic, readwrite, retain) NSString* tabId;
@property(nonatomic, readwrite, getter=isOpenedByDOM) BOOL openedByDOM;
@property(nonatomic, readwrite, assign) NSInteger previousNavigationIndex;
@property(nonatomic, readwrite, retain)
@@ -41,7 +40,6 @@ CRWSessionStorage* SessionStorageBuilder::BuildStorage(
CRWSessionController* session_controller =
navigation_manager->GetSessionController();
serialized_navigation_manager.openedByDOM = session_controller.openedByDOM;
- serialized_navigation_manager.windowName = session_controller.windowName;
serialized_navigation_manager.currentNavigationIndex =
session_controller.currentNavigationIndex;
serialized_navigation_manager.previousNavigationIndex =
@@ -80,11 +78,10 @@ void SessionStorageBuilder::ExtractSessionState(
}
NSUInteger current_index = storage.currentNavigationIndex;
base::scoped_nsobject<CRWSessionController> session_controller(
- [[CRWSessionController alloc] initWithNavigationItems:std::move(items)
- currentIndex:current_index
- browserState:nullptr]);
+ [[CRWSessionController alloc] initWithBrowserState:nullptr
+ navigationItems:std::move(items)
+ currentIndex:current_index]);
[session_controller setOpenedByDOM:storage.openedByDOM];
- [session_controller setWindowName:storage.windowName];
[session_controller
setPreviousNavigationIndex:storage.previousNavigationIndex];
[session_controller setLastVisitedTimestamp:storage.lastVisitedTimestamp];
« no previous file with comments | « ios/web/navigation/navigation_manager_impl_unittest.mm ('k') | ios/web/net/crw_ssl_status_updater_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698