Chromium Code Reviews| Index: ios/web/web_state/ui/crw_web_controller.mm |
| diff --git a/ios/web/web_state/ui/crw_web_controller.mm b/ios/web/web_state/ui/crw_web_controller.mm |
| index da87296de68bf0eaeb586d5777504fa4c72c013c..7ba6a381f4510abe18da7d8efb491bcb0fe6c51b 100644 |
| --- a/ios/web/web_state/ui/crw_web_controller.mm |
| +++ b/ios/web/web_state/ui/crw_web_controller.mm |
| @@ -1989,7 +1989,7 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5; |
| [self removeWebViewAllowingCachedReconstruction:NO]; |
| web::NavigationItem* item = [self currentNavItem]; |
| - const GURL targetURL = item ? item->GetVirtualURL() : GURL::EmptyGURL(); |
| + const GURL targetURL = item ? item->GetURL() : GURL::EmptyGURL(); |
| const web::Referrer referrer; |
| id<CRWNativeContent> nativeContent = |
| [_nativeProvider controllerForURL:targetURL]; |
| @@ -1999,7 +1999,8 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5; |
| if ([nativeContent respondsToSelector:@selector(virtualURL)]) { |
| item->SetVirtualURL([nativeContent virtualURL]); |
| } |
| - [self registerLoadRequest:targetURL |
| + const GURL virtualURL = item ? item->GetVirtualURL() : GURL::EmptyGURL(); |
| + [self registerLoadRequest:virtualURL |
|
Olivier
2016/12/19 12:18:59
All other calls to this method take the virtualURL
Olivier
2016/12/19 13:00:04
Obsolete. I add to change this everywhere as regis
|
| referrer:referrer |
| transition:[self currentTransition]]; |
| [self loadNativeViewWithSuccess:YES]; |
| @@ -2086,7 +2087,7 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5; |
| [self clearTransientContentView]; |
| web::NavigationItem* item = [self currentNavItem]; |
| - const GURL currentURL = item ? item->GetVirtualURL() : GURL::EmptyGURL(); |
| + const GURL currentURL = item ? item->GetURL() : GURL::EmptyGURL(); |
| // If it's a chrome URL, but not a native one, create the WebUI instance. |
| if (web::GetWebClient()->IsAppSpecificURL(currentURL) && |
| ![_nativeProvider hasControllerForURL:currentURL]) { |