| 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/format_macros.h" | 10 #include "base/format_macros.h" |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 | 84 |
| 85 // The timestamp of the last time this tab is visited, represented in time | 85 // The timestamp of the last time this tab is visited, represented in time |
| 86 // interval since 1970. | 86 // interval since 1970. |
| 87 NSTimeInterval _lastVisitedTimestamp; | 87 NSTimeInterval _lastVisitedTimestamp; |
| 88 | 88 |
| 89 // If |YES|, override |currentEntry.useDesktopUserAgent| and create the | 89 // If |YES|, override |currentEntry.useDesktopUserAgent| and create the |
| 90 // pending entry using the desktop user agent. | 90 // pending entry using the desktop user agent. |
| 91 BOOL _useDesktopUserAgentForNextPendingEntry; | 91 BOOL _useDesktopUserAgentForNextPendingEntry; |
| 92 | 92 |
| 93 // The browser state associated with this CRWSessionController; | 93 // The browser state associated with this CRWSessionController; |
| 94 __weak web::BrowserState* _browserState; | 94 web::BrowserState* _browserState; // weak |
| 95 | 95 |
| 96 // Time smoother for navigation entry timestamps; see comment in | 96 // Time smoother for navigation entry timestamps; see comment in |
| 97 // navigation_controller_impl.h | 97 // navigation_controller_impl.h |
| 98 web::TimeSmoother _timeSmoother; | 98 web::TimeSmoother _timeSmoother; |
| 99 | 99 |
| 100 // XCallback parameters used to create (or clobber) the tab. Can be nil. | 100 // XCallback parameters used to create (or clobber) the tab. Can be nil. |
| 101 XCallbackParameters* _xCallbackParameters; | 101 XCallbackParameters* _xCallbackParameters; |
| 102 | 102 |
| 103 base::mac::ObjCPropertyReleaser _propertyReleaser_CRWSessionController; | 103 base::mac::ObjCPropertyReleaser _propertyReleaser_CRWSessionController; |
| 104 } | 104 } |
| (...skipping 780 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 885 item->SetURL(loaded_url); | 885 item->SetURL(loaded_url); |
| 886 item->SetReferrer(referrer); | 886 item->SetReferrer(referrer); |
| 887 item->SetTransitionType(transition); | 887 item->SetTransitionType(transition); |
| 888 item->SetIsOverridingUserAgent(useDesktopUserAgent); | 888 item->SetIsOverridingUserAgent(useDesktopUserAgent); |
| 889 item->set_is_renderer_initiated(rendererInitiated); | 889 item->set_is_renderer_initiated(rendererInitiated); |
| 890 return [ | 890 return [ |
| 891 [[CRWSessionEntry alloc] initWithNavigationItem:item.Pass()] autorelease]; | 891 [[CRWSessionEntry alloc] initWithNavigationItem:item.Pass()] autorelease]; |
| 892 } | 892 } |
| 893 | 893 |
| 894 @end | 894 @end |
| OLD | NEW |