Commit e948fa4c authored by olivierrobin's avatar olivierrobin Committed by Commit bot

Call registerLoadRequest with URL instead of VirtualURL.

registerLoadRequest must take a URL as it is comparing it with a URL.

BUG=671964

Review-Url: https://codereview.chromium.org/2582373002
Cr-Commit-Position: refs/heads/master@{#439756}
parent cf87bb1c
...@@ -1989,16 +1989,17 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5; ...@@ -1989,16 +1989,17 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
[self removeWebViewAllowingCachedReconstruction:NO]; [self removeWebViewAllowingCachedReconstruction:NO];
web::NavigationItem* item = [self currentNavItem]; web::NavigationItem* item = [self currentNavItem];
const GURL targetURL = item ? item->GetVirtualURL() : GURL::EmptyGURL(); const GURL virtualURL = item ? item->GetVirtualURL() : GURL::EmptyGURL();
const web::Referrer referrer; const web::Referrer referrer;
id<CRWNativeContent> nativeContent = id<CRWNativeContent> nativeContent =
[_nativeProvider controllerForURL:targetURL]; [_nativeProvider controllerForURL:virtualURL];
// Unlike the WebView case, always create a new controller and view. // Unlike the WebView case, always create a new controller and view.
// TODO(pinkerton): What to do if this does return nil? // TODO(pinkerton): What to do if this does return nil?
[self setNativeController:nativeContent]; [self setNativeController:nativeContent];
if ([nativeContent respondsToSelector:@selector(virtualURL)]) { if ([nativeContent respondsToSelector:@selector(virtualURL)]) {
item->SetVirtualURL([nativeContent virtualURL]); item->SetVirtualURL([nativeContent virtualURL]);
} }
const GURL targetURL = item ? item->GetURL() : GURL::EmptyGURL();
[self registerLoadRequest:targetURL [self registerLoadRequest:targetURL
referrer:referrer referrer:referrer
transition:[self currentTransition]]; transition:[self currentTransition]];
...@@ -5629,7 +5630,7 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5; ...@@ -5629,7 +5630,7 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
[request setHTTPBody:POSTData]; [request setHTTPBody:POSTData];
[request setAllHTTPHeaderFields:[self currentHTTPHeaders]]; [request setAllHTTPHeaderFields:[self currentHTTPHeaders]];
GURL navigationURL = GURL navigationURL =
currentItem ? currentItem->GetVirtualURL() : GURL::EmptyGURL(); currentItem ? currentItem->GetURL() : GURL::EmptyGURL();
[self registerLoadRequest:navigationURL [self registerLoadRequest:navigationURL
referrer:[self currentSessionEntryReferrer] referrer:[self currentSessionEntryReferrer]
transition:[self currentTransition]]; transition:[self currentTransition]];
...@@ -5639,7 +5640,7 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5; ...@@ -5639,7 +5640,7 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
ProceduralBlock defaultNavigationBlock = ^{ ProceduralBlock defaultNavigationBlock = ^{
web::NavigationItem* item = [self currentNavItem]; web::NavigationItem* item = [self currentNavItem];
GURL navigationURL = item ? item->GetVirtualURL() : GURL::EmptyGURL(); GURL navigationURL = item ? item->GetURL() : GURL::EmptyGURL();
[self registerLoadRequest:navigationURL [self registerLoadRequest:navigationURL
referrer:[self currentSessionEntryReferrer] referrer:[self currentSessionEntryReferrer]
transition:[self currentTransition]]; transition:[self currentTransition]];
...@@ -5674,7 +5675,7 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5; ...@@ -5674,7 +5675,7 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
// will be a no-op when it is passed the current back forward list item, // will be a no-op when it is passed the current back forward list item,
// so |reload| must be explicitly called. // so |reload| must be explicitly called.
web::NavigationItem* item = [self currentNavItem]; web::NavigationItem* item = [self currentNavItem];
GURL navigationURL = item ? item->GetVirtualURL() : GURL::EmptyGURL(); GURL navigationURL = item ? item->GetURL() : GURL::EmptyGURL();
[self registerLoadRequest:navigationURL [self registerLoadRequest:navigationURL
referrer:[self currentSessionEntryReferrer] referrer:[self currentSessionEntryReferrer]
transition:[self currentTransition]]; transition:[self currentTransition]];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment