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 715 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
726 if (transientRewriters) { | 726 if (transientRewriters) { |
727 urlWasRewritten = web::BrowserURLRewriter::RewriteURLWithWriters( | 727 urlWasRewritten = web::BrowserURLRewriter::RewriteURLWithWriters( |
728 &loaded_url, _browserState, *transientRewriters.get()); | 728 &loaded_url, _browserState, *transientRewriters.get()); |
729 } | 729 } |
730 } | 730 } |
731 if (!urlWasRewritten) { | 731 if (!urlWasRewritten) { |
732 web::BrowserURLRewriter::GetInstance()->RewriteURLIfNecessary( | 732 web::BrowserURLRewriter::GetInstance()->RewriteURLIfNecessary( |
733 &loaded_url, _browserState); | 733 &loaded_url, _browserState); |
734 } | 734 } |
735 std::unique_ptr<web::NavigationItemImpl> item(new web::NavigationItemImpl()); | 735 std::unique_ptr<web::NavigationItemImpl> item(new web::NavigationItemImpl()); |
| 736 item->SetOriginalRequestURL(loaded_url); |
736 item->SetURL(loaded_url); | 737 item->SetURL(loaded_url); |
737 item->SetReferrer(referrer); | 738 item->SetReferrer(referrer); |
738 item->SetTransitionType(transition); | 739 item->SetTransitionType(transition); |
739 item->SetIsOverridingUserAgent(useDesktopUserAgent); | 740 item->SetIsOverridingUserAgent(useDesktopUserAgent); |
740 item->set_is_renderer_initiated(rendererInitiated); | 741 item->set_is_renderer_initiated(rendererInitiated); |
741 return [[CRWSessionEntry alloc] initWithNavigationItem:std::move(item)]; | 742 return [[CRWSessionEntry alloc] initWithNavigationItem:std::move(item)]; |
742 } | 743 } |
743 | 744 |
744 - (BOOL)isRedirectTransitionForEntryAtIndex:(NSInteger)index { | 745 - (BOOL)isRedirectTransitionForEntryAtIndex:(NSInteger)index { |
745 ui::PageTransition transition = | 746 ui::PageTransition transition = |
746 [_entries[index] navigationItem]->GetTransitionType(); | 747 [_entries[index] navigationItem]->GetTransitionType(); |
747 return (transition & ui::PAGE_TRANSITION_IS_REDIRECT_MASK) ? YES : NO; | 748 return (transition & ui::PAGE_TRANSITION_IS_REDIRECT_MASK) ? YES : NO; |
748 } | 749 } |
749 | 750 |
750 @end | 751 @end |
OLD | NEW |