| 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 fca9891d71788412f168806b0faf4537e7bf1e60..23d50b6f5dc888c4e7c991227f8fd14e899b0003 100644
|
| --- a/ios/web/navigation/crw_session_controller.mm
|
| +++ b/ios/web/navigation/crw_session_controller.mm
|
| @@ -221,6 +221,10 @@
|
| return [self itemListForEntryList:self.entries];
|
| }
|
|
|
| +- (NSUInteger)itemCount {
|
| + return self.entries.count;
|
| +}
|
| +
|
| - (web::NavigationItemImpl*)currentItem {
|
| return self.currentEntry.navigationItemImpl;
|
| }
|
| @@ -641,14 +645,20 @@
|
| }
|
|
|
| - (NSInteger)indexOfItem:(const web::NavigationItem*)item {
|
| - web::NavigationItemList items = self.items;
|
| - for (NSInteger i = 0; i < static_cast<NSInteger>(items.size()); ++i) {
|
| - if (items[i] == item)
|
| - return i;
|
| + for (NSUInteger index = 0; index < self.entries.count; ++index) {
|
| + if ([self.entries[index] navigationItem] == item)
|
| + return static_cast<NSInteger>(index);
|
| }
|
| return NSNotFound;
|
| }
|
|
|
| +- (web::NavigationItemImpl*)itemAtIndex:(NSInteger)index {
|
| + if (index < 0 || self.entries.count <= static_cast<NSUInteger>(index))
|
| + return nullptr;
|
| + return static_cast<web::NavigationItemImpl*>(
|
| + [self.entries[index] navigationItem]);
|
| +}
|
| +
|
| #pragma mark -
|
| #pragma mark Private methods
|
|
|
|
|