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

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

Issue 2724073005: Remove NavigationManager::GetPreviousItem(). (Closed)
Patch Set: Address comments. Created 3 years, 10 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
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 737cd94385bad697c107319a30b665897cbefe43..ac70ae690e7700a80376b9308bfa12bc6955fe8d 100644
--- a/ios/web/navigation/navigation_manager_impl.mm
+++ b/ios/web/navigation/navigation_manager_impl.mm
@@ -140,8 +140,8 @@ void NavigationManagerImpl::OnNavigationItemCommitted() {
DCHECK(details.item);
details.previous_item_index = [session_controller_ previousNavigationIndex];
if (details.previous_item_index >= 0) {
- DCHECK(GetPreviousItem());
- details.previous_url = GetPreviousItem()->GetURL();
+ DCHECK([session_controller_ previousItem]);
+ details.previous_url = [session_controller_ previousItem]->GetURL();
details.is_in_page =
AreURLsInPageNavigation(details.previous_url, details.item->GetURL());
} else {
@@ -219,10 +219,6 @@ NavigationItem* NavigationManagerImpl::GetLastUserItem() const {
return [session_controller_ lastUserItem];
}
-NavigationItem* NavigationManagerImpl::GetPreviousItem() const {
- return [session_controller_ previousItem];
-}
-
NavigationItemList NavigationManagerImpl::GetItems() const {
return [session_controller_ items];
}
@@ -275,12 +271,11 @@ void NavigationManagerImpl::AddTransientURLRewriter(
}
int NavigationManagerImpl::GetItemCount() const {
- return GetItems().size();
+ return [session_controller_ itemCount];
}
NavigationItem* NavigationManagerImpl::GetItemAtIndex(size_t index) const {
- NavigationItemList items = GetItems();
- return index < items.size() ? items[index] : nullptr;
+ return [session_controller_ itemAtIndex:index];
}
int NavigationManagerImpl::GetCurrentItemIndex() const {
@@ -300,7 +295,7 @@ int NavigationManagerImpl::GetPendingItemIndex() const {
}
int NavigationManagerImpl::GetLastCommittedItemIndex() const {
- if (GetItems().empty())
+ if (GetItemCount() == 0)
return -1;
return [session_controller_ currentNavigationIndex];
}
@@ -309,8 +304,7 @@ bool NavigationManagerImpl::RemoveItemAtIndex(int index) {
if (index == GetLastCommittedItemIndex() || index == GetPendingItemIndex())
return false;
- size_t idx = static_cast<size_t>(index);
- if (idx >= GetItems().size())
+ if (index < 0 || index >= GetItemCount())
return false;
[session_controller_ removeItemAtIndex:index];
« no previous file with comments | « ios/web/navigation/navigation_manager_impl.h ('k') | ios/web/navigation/navigation_manager_impl_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698