Chromium Code Reviews| 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 61 referrer = other.referrer; | 61 referrer = other.referrer; |
| 62 is_renderer_initiated = other.is_renderer_initiated; | 62 is_renderer_initiated = other.is_renderer_initiated; |
| 63 transition_type = other.transition_type; | 63 transition_type = other.transition_type; |
| 64 extra_headers.reset([other.extra_headers copy]); | 64 extra_headers.reset([other.extra_headers copy]); |
| 65 post_data.reset([other.post_data copy]); | 65 post_data.reset([other.post_data copy]); |
| 66 | 66 |
| 67 return *this; | 67 return *this; |
| 68 } | 68 } |
| 69 | 69 |
| 70 NavigationManagerImpl::NavigationManagerImpl() | 70 NavigationManagerImpl::NavigationManagerImpl() |
| 71 : delegate_(nullptr), browser_state_(nullptr), facade_delegate_(nullptr) {} | 71 : override_desktop_user_agent_for_next_pending_item_(false), |
| 72 delegate_(nullptr), | |
| 73 browser_state_(nullptr), | |
| 74 facade_delegate_(nullptr) {} | |
| 72 | 75 |
| 73 NavigationManagerImpl::~NavigationManagerImpl() { | 76 NavigationManagerImpl::~NavigationManagerImpl() { |
| 74 // The facade layer should be deleted before this object. | 77 // The facade layer should be deleted before this object. |
| 75 DCHECK(!facade_delegate_); | 78 DCHECK(!facade_delegate_); |
| 76 | 79 |
| 77 [session_controller_ setNavigationManager:nullptr]; | 80 [session_controller_ setNavigationManager:nullptr]; |
| 78 } | 81 } |
| 79 | 82 |
| 80 void NavigationManagerImpl::SetDelegate(NavigationManagerDelegate* delegate) { | 83 void NavigationManagerImpl::SetDelegate(NavigationManagerDelegate* delegate) { |
| 81 delegate_ = delegate; | 84 delegate_ = delegate; |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 166 } | 169 } |
| 167 | 170 |
| 168 void NavigationManagerImpl::LoadURL(const GURL& url, | 171 void NavigationManagerImpl::LoadURL(const GURL& url, |
| 169 const web::Referrer& referrer, | 172 const web::Referrer& referrer, |
| 170 ui::PageTransition type) { | 173 ui::PageTransition type) { |
| 171 WebState::OpenURLParams params(url, referrer, | 174 WebState::OpenURLParams params(url, referrer, |
| 172 WindowOpenDisposition::CURRENT_TAB, type, NO); | 175 WindowOpenDisposition::CURRENT_TAB, type, NO); |
| 173 delegate_->GetWebState()->OpenURL(params); | 176 delegate_->GetWebState()->OpenURL(params); |
| 174 } | 177 } |
| 175 | 178 |
| 179 void NavigationManagerImpl::AddUserInitiatedPendingItem( | |
| 180 const GURL& url, | |
| 181 const web::Referrer& referrer, | |
| 182 ui::PageTransition type) { | |
| 183 AddPendingItem(url, referrer, type, false); | |
| 184 } | |
|
Eugene But (OOO till 7-30)
2017/02/16 02:20:48
nit: add a linebreak
liaoyuke
2017/02/16 22:04:29
Acknowledged.
| |
| 185 void NavigationManagerImpl::AddRendererInitiatedPendingItem( | |
| 186 const GURL& url, | |
| 187 const web::Referrer& referrer, | |
| 188 ui::PageTransition type) { | |
| 189 AddPendingItem(url, referrer, type, true); | |
| 190 } | |
| 191 | |
| 176 NavigationItem* NavigationManagerImpl::GetLastUserItem() const { | 192 NavigationItem* NavigationManagerImpl::GetLastUserItem() const { |
| 177 CRWSessionEntry* entry = [session_controller_ lastUserEntry]; | 193 CRWSessionEntry* entry = [session_controller_ lastUserEntry]; |
| 178 return [entry navigationItem]; | 194 return [entry navigationItem]; |
| 179 } | 195 } |
| 180 | 196 |
| 181 NavigationItem* NavigationManagerImpl::GetPreviousItem() const { | 197 NavigationItem* NavigationManagerImpl::GetPreviousItem() const { |
| 182 CRWSessionEntry* entry = [session_controller_ previousEntry]; | 198 CRWSessionEntry* entry = [session_controller_ previousEntry]; |
| 183 return [entry navigationItem]; | 199 return [entry navigationItem]; |
| 184 } | 200 } |
| 185 | 201 |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 389 // Result may be out of bounds, so stop trying to skip redirect items and | 405 // Result may be out of bounds, so stop trying to skip redirect items and |
| 390 // simply add the remainder. | 406 // simply add the remainder. |
| 391 result += offset; | 407 result += offset; |
| 392 if (result < 0 /* overflow */) | 408 if (result < 0 /* overflow */) |
| 393 result = INT_MAX; | 409 result = INT_MAX; |
| 394 } | 410 } |
| 395 | 411 |
| 396 return result; | 412 return result; |
| 397 } | 413 } |
| 398 | 414 |
| 415 void NavigationManagerImpl::OverrideDesktopUserAgentForNextPendingItem() { | |
| 416 if (GetPendingItem()) | |
| 417 GetPendingItem()->SetIsOverridingUserAgent(true); | |
| 418 else | |
| 419 override_desktop_user_agent_for_next_pending_item_ = true; | |
| 420 } | |
| 421 | |
| 399 bool NavigationManagerImpl::IsRedirectItemAtIndex(int index) const { | 422 bool NavigationManagerImpl::IsRedirectItemAtIndex(int index) const { |
| 400 DCHECK_GT(index, 0); | 423 DCHECK_GT(index, 0); |
| 401 DCHECK_LT(index, GetItemCount()); | 424 DCHECK_LT(index, GetItemCount()); |
| 402 ui::PageTransition transition = GetItemAtIndex(index)->GetTransitionType(); | 425 ui::PageTransition transition = GetItemAtIndex(index)->GetTransitionType(); |
| 403 return transition & ui::PAGE_TRANSITION_IS_REDIRECT_MASK; | 426 return transition & ui::PAGE_TRANSITION_IS_REDIRECT_MASK; |
| 404 } | 427 } |
| 405 | 428 |
| 429 void NavigationManagerImpl::AddPendingItem(const GURL& url, | |
| 430 const web::Referrer& referrer, | |
| 431 ui::PageTransition type, | |
| 432 bool renderer_initiated) { | |
| 433 [session_controller_ addPendingItem:url | |
| 434 referrer:referrer | |
| 435 transition:type | |
| 436 rendererInitiated:renderer_initiated]; | |
| 437 | |
| 438 bool use_desktop_user_agent = | |
| 439 override_desktop_user_agent_for_next_pending_item_ || | |
| 440 (GetLastCommittedItem() && | |
| 441 GetLastCommittedItem()->IsOverridingUserAgent()); | |
| 442 GetPendingItem()->SetIsOverridingUserAgent(use_desktop_user_agent); | |
| 443 override_desktop_user_agent_for_next_pending_item_ = false; | |
| 444 } | |
| 445 | |
| 406 } // namespace web | 446 } // namespace web |
| OLD | NEW |