| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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/crw_session_controller.h" | 5 #import "ios/web/navigation/crw_session_controller.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 747 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 758 if (transientRewriters) { | 758 if (transientRewriters) { |
| 759 urlWasRewritten = web::BrowserURLRewriter::RewriteURLWithWriters( | 759 urlWasRewritten = web::BrowserURLRewriter::RewriteURLWithWriters( |
| 760 &loaded_url, _browserState, *transientRewriters.get()); | 760 &loaded_url, _browserState, *transientRewriters.get()); |
| 761 } | 761 } |
| 762 } | 762 } |
| 763 if (!urlWasRewritten) { | 763 if (!urlWasRewritten) { |
| 764 web::BrowserURLRewriter::GetInstance()->RewriteURLIfNecessary( | 764 web::BrowserURLRewriter::GetInstance()->RewriteURLIfNecessary( |
| 765 &loaded_url, _browserState); | 765 &loaded_url, _browserState); |
| 766 } | 766 } |
| 767 std::unique_ptr<web::NavigationItemImpl> item(new web::NavigationItemImpl()); | 767 std::unique_ptr<web::NavigationItemImpl> item(new web::NavigationItemImpl()); |
| 768 item->SetOriginalRequestURL(loaded_url); |
| 768 item->SetURL(loaded_url); | 769 item->SetURL(loaded_url); |
| 769 item->SetReferrer(referrer); | 770 item->SetReferrer(referrer); |
| 770 item->SetTransitionType(transition); | 771 item->SetTransitionType(transition); |
| 771 item->SetIsOverridingUserAgent(useDesktopUserAgent); | 772 item->SetIsOverridingUserAgent(useDesktopUserAgent); |
| 772 item->set_is_renderer_initiated(rendererInitiated); | 773 item->set_is_renderer_initiated(rendererInitiated); |
| 773 return [[CRWSessionEntry alloc] initWithNavigationItem:std::move(item)]; | 774 return [[CRWSessionEntry alloc] initWithNavigationItem:std::move(item)]; |
| 774 } | 775 } |
| 775 | 776 |
| 776 - (BOOL)isRedirectTransitionForEntryAtIndex:(NSInteger)index { | 777 - (BOOL)isRedirectTransitionForEntryAtIndex:(NSInteger)index { |
| 777 ui::PageTransition transition = | 778 ui::PageTransition transition = |
| 778 [_entries[index] navigationItem]->GetTransitionType(); | 779 [_entries[index] navigationItem]->GetTransitionType(); |
| 779 return (transition & ui::PAGE_TRANSITION_IS_REDIRECT_MASK) ? YES : NO; | 780 return (transition & ui::PAGE_TRANSITION_IS_REDIRECT_MASK) ? YES : NO; |
| 780 } | 781 } |
| 781 | 782 |
| 782 @end | 783 @end |
| OLD | NEW |