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

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

Issue 2737203002: Remove CRWSessionEntry. (Closed)
Patch Set: fix XCode-clang build Created 3 years, 9 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/navigation_item_impl_list.mm ('k') | ios/web/navigation/session_storage_builder.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/navigation/navigation_manager_impl.mm
diff --git a/ios/web/navigation/navigation_manager_impl.mm b/ios/web/navigation/navigation_manager_impl.mm
index ac70ae690e7700a80376b9308bfa12bc6955fe8d..539998a100e00a180f6c513fd16974314eef6e36 100644
--- a/ios/web/navigation/navigation_manager_impl.mm
+++ b/ios/web/navigation/navigation_manager_impl.mm
@@ -12,6 +12,7 @@
#import "ios/web/navigation/crw_session_controller+private_constructors.h"
#import "ios/web/navigation/crw_session_controller.h"
#import "ios/web/navigation/navigation_item_impl.h"
+#import "ios/web/navigation/navigation_item_impl_list.h"
#import "ios/web/navigation/navigation_manager_delegate.h"
#include "ios/web/navigation/navigation_manager_facade_delegate.h"
#include "ios/web/public/load_committed_details.h"
@@ -220,7 +221,7 @@ bool AreURLsInPageNavigation(const GURL& existing_url, const GURL& new_url) {
}
NavigationItemList NavigationManagerImpl::GetItems() const {
- return [session_controller_ items];
+ return CreateNavigationItemList([session_controller_ items]);
}
BrowserState* NavigationManagerImpl::GetBrowserState() const {
@@ -271,7 +272,7 @@ bool AreURLsInPageNavigation(const GURL& existing_url, const GURL& new_url) {
}
int NavigationManagerImpl::GetItemCount() const {
- return [session_controller_ itemCount];
+ return [session_controller_ items].size();
}
NavigationItem* NavigationManagerImpl::GetItemAtIndex(size_t index) const {
@@ -446,9 +447,9 @@ bool AreURLsInPageNavigation(const GURL& existing_url, const GURL& new_url) {
if (index == -1)
return nullptr;
WebClient* client = GetWebClient();
- NavigationItemList items = [session_controller_ items];
+ const ScopedNavigationItemImplList& items = [session_controller_ items];
while (index >= 0) {
- NavigationItem* item = items[index--];
+ NavigationItem* item = items[index--].get();
if (!client->IsAppSpecificURL(item->GetVirtualURL()))
return item;
}
« no previous file with comments | « ios/web/navigation/navigation_item_impl_list.mm ('k') | ios/web/navigation/session_storage_builder.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698