| 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 #ifndef IOS_WEB_NAVIGATION_CRW_SESSION_ENTRY_H_ | 5 #ifndef IOS_WEB_NAVIGATION_CRW_SESSION_ENTRY_H_ |
| 6 #define IOS_WEB_NAVIGATION_CRW_SESSION_ENTRY_H_ | 6 #define IOS_WEB_NAVIGATION_CRW_SESSION_ENTRY_H_ |
| 7 | 7 |
| 8 #import <Foundation/Foundation.h> | 8 #import <Foundation/Foundation.h> |
| 9 #include <stdint.h> | 9 #include <stdint.h> |
| 10 | 10 |
| 11 #include "base/memory/scoped_ptr.h" | 11 #include <memory> |
| 12 |
| 12 #include "base/strings/string16.h" | 13 #include "base/strings/string16.h" |
| 13 #include "base/time/time.h" | 14 #include "base/time/time.h" |
| 14 #include "ui/base/page_transition_types.h" | 15 #include "ui/base/page_transition_types.h" |
| 15 #include "url/gurl.h" | 16 #include "url/gurl.h" |
| 16 | 17 |
| 17 namespace web { | 18 namespace web { |
| 18 class NavigationItem; | 19 class NavigationItem; |
| 19 class NavigationItemImpl; | 20 class NavigationItemImpl; |
| 20 struct Referrer; | 21 struct Referrer; |
| 21 | 22 |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 @property(nonatomic, readonly) const GURL& originalUrl; | 65 @property(nonatomic, readonly) const GURL& originalUrl; |
| 65 | 66 |
| 66 // Pointer to the NavigationItem associated with this CRWSessionEntry. | 67 // Pointer to the NavigationItem associated with this CRWSessionEntry. |
| 67 // Eventually, this will replace CRWSessionEntry entirely. | 68 // Eventually, this will replace CRWSessionEntry entirely. |
| 68 @property(nonatomic, readonly) web::NavigationItem* navigationItem; | 69 @property(nonatomic, readonly) web::NavigationItem* navigationItem; |
| 69 | 70 |
| 70 // Pointer to the NavigationItemImpl associated with this CRWSessionEntry. | 71 // Pointer to the NavigationItemImpl associated with this CRWSessionEntry. |
| 71 @property(nonatomic, readonly) web::NavigationItemImpl* navigationItemImpl; | 72 @property(nonatomic, readonly) web::NavigationItemImpl* navigationItemImpl; |
| 72 | 73 |
| 73 // Initialize the session entry with the given NavigationItem. | 74 // Initialize the session entry with the given NavigationItem. |
| 74 - (instancetype)initWithNavigationItem:(scoped_ptr<web::NavigationItem>)item; | 75 - (instancetype)initWithNavigationItem: |
| 76 (std::unique_ptr<web::NavigationItem>)item; |
| 75 | 77 |
| 76 @end | 78 @end |
| 77 | 79 |
| 78 #endif // IOS_WEB_NAVIGATION_CRW_SESSION_ENTRY_H_ | 80 #endif // IOS_WEB_NAVIGATION_CRW_SESSION_ENTRY_H_ |
| OLD | NEW |