| 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 #include "ios/web/navigation/navigation_manager_impl.h" | 5 #include "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 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 } | 161 } |
| 162 } | 162 } |
| 163 | 163 |
| 164 CRWSessionController* NavigationManagerImpl::GetSessionController() { | 164 CRWSessionController* NavigationManagerImpl::GetSessionController() { |
| 165 return session_controller_; | 165 return session_controller_; |
| 166 } | 166 } |
| 167 | 167 |
| 168 void NavigationManagerImpl::LoadURL(const GURL& url, | 168 void NavigationManagerImpl::LoadURL(const GURL& url, |
| 169 const web::Referrer& referrer, | 169 const web::Referrer& referrer, |
| 170 ui::PageTransition type) { | 170 ui::PageTransition type) { |
| 171 WebState::OpenURLParams params(url, referrer, CURRENT_TAB, type, NO); | 171 WebState::OpenURLParams params(url, referrer, |
| 172 WindowOpenDisposition::CURRENT_TAB, type, NO); |
| 172 delegate_->GetWebState()->OpenURL(params); | 173 delegate_->GetWebState()->OpenURL(params); |
| 173 } | 174 } |
| 174 | 175 |
| 175 NavigationItem* NavigationManagerImpl::GetLastUserItem() const { | 176 NavigationItem* NavigationManagerImpl::GetLastUserItem() const { |
| 176 CRWSessionEntry* entry = [session_controller_ lastUserEntry]; | 177 CRWSessionEntry* entry = [session_controller_ lastUserEntry]; |
| 177 return [entry navigationItem]; | 178 return [entry navigationItem]; |
| 178 } | 179 } |
| 179 | 180 |
| 180 NavigationItem* NavigationManagerImpl::GetPreviousItem() const { | 181 NavigationItem* NavigationManagerImpl::GetPreviousItem() const { |
| 181 CRWSessionEntry* entry = [session_controller_ previousEntry]; | 182 CRWSessionEntry* entry = [session_controller_ previousEntry]; |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 303 } | 304 } |
| 304 } | 305 } |
| 305 | 306 |
| 306 void NavigationManagerImpl::Reload(bool check_for_reposts) { | 307 void NavigationManagerImpl::Reload(bool check_for_reposts) { |
| 307 // Navigation manager may be empty if the only pending entry failed to load | 308 // Navigation manager may be empty if the only pending entry failed to load |
| 308 // with SSL error and the user has decided not to proceed. | 309 // with SSL error and the user has decided not to proceed. |
| 309 NavigationItem* item = GetVisibleItem(); | 310 NavigationItem* item = GetVisibleItem(); |
| 310 GURL url = item ? item->GetURL() : GURL(url::kAboutBlankURL); | 311 GURL url = item ? item->GetURL() : GURL(url::kAboutBlankURL); |
| 311 web::Referrer referrer = item ? item->GetReferrer() : web::Referrer(); | 312 web::Referrer referrer = item ? item->GetReferrer() : web::Referrer(); |
| 312 | 313 |
| 313 WebState::OpenURLParams params(url, referrer, CURRENT_TAB, | 314 WebState::OpenURLParams params(url, referrer, |
| 315 WindowOpenDisposition::CURRENT_TAB, |
| 314 ui::PAGE_TRANSITION_RELOAD, NO); | 316 ui::PAGE_TRANSITION_RELOAD, NO); |
| 315 delegate_->GetWebState()->OpenURL(params); | 317 delegate_->GetWebState()->OpenURL(params); |
| 316 } | 318 } |
| 317 | 319 |
| 318 std::unique_ptr<std::vector<BrowserURLRewriter::URLRewriter>> | 320 std::unique_ptr<std::vector<BrowserURLRewriter::URLRewriter>> |
| 319 NavigationManagerImpl::GetTransientURLRewriters() { | 321 NavigationManagerImpl::GetTransientURLRewriters() { |
| 320 return std::move(transient_url_rewriters_); | 322 return std::move(transient_url_rewriters_); |
| 321 } | 323 } |
| 322 | 324 |
| 323 void NavigationManagerImpl::RemoveTransientURLRewriters() { | 325 void NavigationManagerImpl::RemoveTransientURLRewriters() { |
| 324 transient_url_rewriters_.reset(); | 326 transient_url_rewriters_.reset(); |
| 325 } | 327 } |
| 326 | 328 |
| 327 void NavigationManagerImpl::CopyState( | 329 void NavigationManagerImpl::CopyState( |
| 328 NavigationManagerImpl* navigation_manager) { | 330 NavigationManagerImpl* navigation_manager) { |
| 329 SetSessionController([navigation_manager->GetSessionController() copy]); | 331 SetSessionController([navigation_manager->GetSessionController() copy]); |
| 330 } | 332 } |
| 331 | 333 |
| 332 } // namespace web | 334 } // namespace web |
| OLD | NEW |