| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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/crw_session_controller.h" | 5 #import "ios/web/navigation/crw_session_controller.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <map> | 10 #include <map> |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 // Redefine as readwrite. | 84 // Redefine as readwrite. |
| 85 @property(nonatomic, readwrite, assign) NSInteger currentNavigationIndex; | 85 @property(nonatomic, readwrite, assign) NSInteger currentNavigationIndex; |
| 86 | 86 |
| 87 // TODO(rohitrao): These properties must be redefined readwrite to work around a | 87 // TODO(rohitrao): These properties must be redefined readwrite to work around a |
| 88 // clang bug. crbug.com/228650 | 88 // clang bug. crbug.com/228650 |
| 89 @property(nonatomic, readwrite, copy) NSString* tabId; | 89 @property(nonatomic, readwrite, copy) NSString* tabId; |
| 90 @property(nonatomic, readwrite, strong) | 90 @property(nonatomic, readwrite, strong) |
| 91 CRWSessionCertificatePolicyManager* sessionCertificatePolicyManager; | 91 CRWSessionCertificatePolicyManager* sessionCertificatePolicyManager; |
| 92 | 92 |
| 93 // Expose setters for serialization properties. These are exposed in a category | 93 // Expose setters for serialization properties. These are exposed in a category |
| 94 // in NavigationManagerStorageBuilder, and will be removed as ownership of | 94 // in SessionStorageBuilder, and will be removed as ownership of |
| 95 // their backing ivars moves to NavigationManagerImpl. | 95 // their backing ivars moves to NavigationManagerImpl. |
| 96 @property(nonatomic, readwrite, copy) NSString* openerId; | 96 @property(nonatomic, readwrite, copy) NSString* openerId; |
| 97 @property(nonatomic, readwrite, getter=isOpenedByDOM) BOOL openedByDOM; | 97 @property(nonatomic, readwrite, getter=isOpenedByDOM) BOOL openedByDOM; |
| 98 @property(nonatomic, readwrite, assign) NSInteger openerNavigationIndex; | 98 @property(nonatomic, readwrite, assign) NSInteger openerNavigationIndex; |
| 99 @property(nonatomic, readwrite, assign) NSInteger previousNavigationIndex; | 99 @property(nonatomic, readwrite, assign) NSInteger previousNavigationIndex; |
| 100 | 100 |
| 101 - (NSString*)uniqueID; | 101 - (NSString*)uniqueID; |
| 102 // Removes all items after currentNavigationIndex_. | 102 // Removes all items after currentNavigationIndex_. |
| 103 - (void)clearForwardItems; | 103 - (void)clearForwardItems; |
| 104 // Discards the transient item, if any. | 104 // Discards the transient item, if any. |
| (...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 740 [[NSMutableArray alloc] initWithCapacity:itemList.size()]; | 740 [[NSMutableArray alloc] initWithCapacity:itemList.size()]; |
| 741 for (web::NavigationItem* item : itemList) { | 741 for (web::NavigationItem* item : itemList) { |
| 742 CRWSessionEntry* entry = | 742 CRWSessionEntry* entry = |
| 743 [self entryForItem:static_cast<web::NavigationItemImpl*>(item)]; | 743 [self entryForItem:static_cast<web::NavigationItemImpl*>(item)]; |
| 744 [entryList addObject:entry]; | 744 [entryList addObject:entry]; |
| 745 } | 745 } |
| 746 return entryList; | 746 return entryList; |
| 747 } | 747 } |
| 748 | 748 |
| 749 @end | 749 @end |
| OLD | NEW |