OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/navigation_manager_impl.h" | 5 #import "ios/web/navigation/navigation_manager_impl.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
163 } | 163 } |
164 | 164 |
165 void NavigationManagerImpl::LoadURL(const GURL& url, | 165 void NavigationManagerImpl::LoadURL(const GURL& url, |
166 const web::Referrer& referrer, | 166 const web::Referrer& referrer, |
167 ui::PageTransition type) { | 167 ui::PageTransition type) { |
168 WebState::OpenURLParams params(url, referrer, | 168 WebState::OpenURLParams params(url, referrer, |
169 WindowOpenDisposition::CURRENT_TAB, type, NO); | 169 WindowOpenDisposition::CURRENT_TAB, type, NO); |
170 delegate_->GetWebState()->OpenURL(params); | 170 delegate_->GetWebState()->OpenURL(params); |
171 } | 171 } |
172 | 172 |
| 173 void NavigationManagerImpl::AddTransientItem(const GURL& url) { |
| 174 [session_controller_ addTransientItemWithURL:url]; |
| 175 |
| 176 // Transient item can only be added for pending non-app-specific loads. |
| 177 DCHECK(GetPendingItem()); |
| 178 DCHECK_NE(UserAgentType::NONE, GetPendingItem()->GetUserAgentType()); |
| 179 GetTransientItem()->SetUserAgentType(GetPendingItem()->GetUserAgentType()); |
| 180 } |
| 181 |
173 void NavigationManagerImpl::AddPendingItem( | 182 void NavigationManagerImpl::AddPendingItem( |
174 const GURL& url, | 183 const GURL& url, |
175 const web::Referrer& referrer, | 184 const web::Referrer& referrer, |
176 ui::PageTransition navigation_type, | 185 ui::PageTransition navigation_type, |
177 NavigationInitiationType initiation_type, | 186 NavigationInitiationType initiation_type, |
178 UserAgentOverrideOption user_agent_override_option) { | 187 UserAgentOverrideOption user_agent_override_option) { |
179 [session_controller_ addPendingItem:url | 188 [session_controller_ addPendingItem:url |
180 referrer:referrer | 189 referrer:referrer |
181 transition:navigation_type | 190 transition:navigation_type |
182 initiationType:initiation_type]; | 191 initiationType:initiation_type]; |
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
458 const ScopedNavigationItemImplList& items = [session_controller_ items]; | 467 const ScopedNavigationItemImplList& items = [session_controller_ items]; |
459 while (index >= 0) { | 468 while (index >= 0) { |
460 NavigationItem* item = items[index--].get(); | 469 NavigationItem* item = items[index--].get(); |
461 if (!client->IsAppSpecificURL(item->GetVirtualURL())) | 470 if (!client->IsAppSpecificURL(item->GetVirtualURL())) |
462 return item; | 471 return item; |
463 } | 472 } |
464 return nullptr; | 473 return nullptr; |
465 } | 474 } |
466 | 475 |
467 } // namespace web | 476 } // namespace web |
OLD | NEW |