Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(153)

Unified Diff: ios/web/web_state/ui/crw_web_controller.mm

Issue 2590803002: Pass URL to nativeProviders. (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 d0e173d1e1f0105bc1c61c357e4b9666154568f9..a77b404878524a1766df8141cb8d3306b295c90d 100644
--- a/ios/web/web_state/ui/crw_web_controller.mm
+++ b/ios/web/web_state/ui/crw_web_controller.mm
@@ -1989,17 +1989,17 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
[self removeWebViewAllowingCachedReconstruction:NO];
web::NavigationItem* item = [self currentNavItem];
- const GURL virtualURL = item ? item->GetVirtualURL() : GURL::EmptyGURL();
+ const GURL targetURL = item ? item->GetURL() : GURL::EmptyGURL();
const web::Referrer referrer;
id<CRWNativeContent> nativeContent =
- [_nativeProvider controllerForURL:virtualURL];
+ [_nativeProvider controllerForURL:targetURL];
// Unlike the WebView case, always create a new controller and view.
// TODO(pinkerton): What to do if this does return nil?
[self setNativeController:nativeContent];
if ([nativeContent respondsToSelector:@selector(virtualURL)]) {
item->SetVirtualURL([nativeContent virtualURL]);
}
- const GURL targetURL = item ? item->GetURL() : GURL::EmptyGURL();
+
[self registerLoadRequest:targetURL
referrer:referrer
transition:[self currentTransition]];
@@ -2087,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]) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698