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

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

Issue 2460153002: Removed xCallbackParameters from CRWSessionController class. (Closed)
Patch Set: . Created 4 years, 2 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
« no previous file with comments | « ios/web/navigation/crw_session_controller.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/navigation/crw_session_controller.mm
diff --git a/ios/web/navigation/crw_session_controller.mm b/ios/web/navigation/crw_session_controller.mm
index 92020d3bb8dba2782c00ec320f7169c66a1c6a37..664bb0bd989c204574259dd5463448ed50b2be2f 100644
--- a/ios/web/navigation/crw_session_controller.mm
+++ b/ios/web/navigation/crw_session_controller.mm
@@ -47,8 +47,7 @@ NSString* const kOpenerNavigationIndexKey = @"openerNavigationIndex";
NSString* const kPreviousNavigationIndexKey = @"previousNavigationIndex";
NSString* const kTabIdKey = @"tabId";
NSString* const kWindowNameKey = @"windowName";
-NSString* const kXCallbackParametersKey = @"xCallbackParameters";
-} // anonymous namespace
+} // namespace
@interface CRWSessionController () {
// Weak pointer back to the owning NavigationManager. This is to facilitate
@@ -103,9 +102,6 @@ NSString* const kXCallbackParametersKey = @"xCallbackParameters";
// Time smoother for navigation entry timestamps; see comment in
// navigation_controller_impl.h
web::TimeSmoother _timeSmoother;
-
- // XCallback parameters used to create (or clobber) the tab. Can be nil.
- XCallbackParameters* _xCallbackParameters;
}
// Redefine as readwrite.
@@ -146,7 +142,6 @@ NSString* const kXCallbackParametersKey = @"xCallbackParameters";
@synthesize openedByDOM = _openedByDOM;
@synthesize openerNavigationIndex = _openerNavigationIndex;
@synthesize sessionCertificatePolicyManager = _sessionCertificatePolicyManager;
-@synthesize xCallbackParameters = _xCallbackParameters;
- (id)initWithWindowName:(NSString*)windowName
openerId:(NSString*)openerId
@@ -238,9 +233,6 @@ NSString* const kXCallbackParametersKey = @"xCallbackParameters";
_sessionCertificatePolicyManager =
[[CRWSessionCertificatePolicyManager alloc] init];
}
-
- _xCallbackParameters =
- [aDecoder decodeObjectForKey:kXCallbackParametersKey];
}
return self;
}
@@ -258,7 +250,6 @@ NSString* const kXCallbackParametersKey = @"xCallbackParameters";
[aCoder encodeObject:_entries forKey:kEntriesKey];
[aCoder encodeObject:_sessionCertificatePolicyManager
forKey:kCertificatePolicyManagerKey];
- [aCoder encodeObject:_xCallbackParameters forKey:kXCallbackParametersKey];
// rendererInitiated is deliberately not preserved, as upstream.
}
@@ -276,8 +267,6 @@ NSString* const kXCallbackParametersKey = @"xCallbackParameters";
[[NSMutableArray alloc] initWithArray:_entries copyItems:YES];
copy->_sessionCertificatePolicyManager =
[_sessionCertificatePolicyManager copy];
- copy->_xCallbackParameters = [base::mac::ObjCCastStrict<NSObject<NSCopying>>(
- _xCallbackParameters) copy];
return copy;
}
@@ -306,11 +295,10 @@ NSString* const kXCallbackParametersKey = @"xCallbackParameters";
return [NSString
stringWithFormat:
@"id: %@\nname: %@\nlast visit: %f\ncurrent index: %" PRIdNS
- @"\nprevious index: %" PRIdNS "\n%@\npending: %@\ntransient: %@\n"
- @"xCallback:\n%@\n",
+ @"\nprevious index: %" PRIdNS "\n%@\npending: %@\ntransient: %@\n",
_tabId, self.windowName, _lastVisitedTimestamp,
_currentNavigationIndex, _previousNavigationIndex, _entries,
- _pendingEntry.get(), _transientEntry.get(), _xCallbackParameters];
+ _pendingEntry.get(), _transientEntry.get()];
}
// Returns the current entry in the session list, or the pending entry if there
@@ -567,8 +555,6 @@ NSString* const kXCallbackParametersKey = @"xCallbackParameters";
self.currentNavigationIndex = -1;
_previousNavigationIndex = -1;
}
- self.xCallbackParameters = [base::mac::ObjCCastStrict<NSObject<NSCopying>>(
- otherSession.xCallbackParameters) copy];
self.windowName = otherSession.windowName;
NSInteger numInitialEntries = [_entries count];
« no previous file with comments | « ios/web/navigation/crw_session_controller.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698