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

Unified Diff: content/browser/frame_host/render_frame_host_manager.cc

Issue 1413863006: Change BrowsingInstance when changing WebUI type. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 months 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: content/browser/frame_host/render_frame_host_manager.cc
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index dc76abd1ca480a5bf233dff67dadbef6122dbfe5..a05b5846ca0683ae60e9df048dcf4880fa8f5a63 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -1257,6 +1257,15 @@ bool RenderFrameHostManager::ShouldSwapBrowsingInstancesForNavigation(
browser_context, new_effective_url)) {
return true;
}
+
+ // Force swap if the current WebUI type differs from the one for the
+ // destination.
+ if (WebUIControllerFactoryRegistry::GetInstance()->GetWebUIType(
+ browser_context, current_effective_url) !=
+ WebUIControllerFactoryRegistry::GetInstance()->GetWebUIType(
+ browser_context, new_effective_url)) {
+ return true;
+ }
} else {
// Force a swap if it's a Web UI URL.
if (WebUIControllerFactoryRegistry::GetInstance()->UseWebUIForURL(
« 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