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

Unified Diff: content/browser/tab_contents/render_view_host_manager.cc

Issue 8443005: Don't reload into an app process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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
Index: content/browser/tab_contents/render_view_host_manager.cc
diff --git a/content/browser/tab_contents/render_view_host_manager.cc b/content/browser/tab_contents/render_view_host_manager.cc
index adfa501f24084156003fdbd37ff7daeb3bd2508e..61b084b3f1f2e202b565eeb9e652a7dc0a8193a9 100644
--- a/content/browser/tab_contents/render_view_host_manager.cc
+++ b/content/browser/tab_contents/render_view_host_manager.cc
@@ -387,22 +387,9 @@ SiteInstance* RenderViewHostManager::GetSiteInstanceForEntry(
NavigationController& controller = delegate_->GetControllerForRenderManager();
content::BrowserContext* browser_context = controller.browser_context();
- // If the entry has an instance already we should use it, unless the URL
- // is part of an app that has been installed or uninstalled since the last
- // visit.
- if (entry.site_instance()) {
- if (entry.site_instance()->HasWrongProcessForURL(dest_url)) {
- // If we need to swap to a different SiteInstance, the new one should have
- // the same max_page_id as the current one so that it identifies new vs
- // existing navigations correctly. We also need to update the entry's
- // SiteInstance, which we will do in TabContents::NavigateToEntry.
- SiteInstance* new_instance =
- curr_instance->GetRelatedSiteInstance(dest_url);
- new_instance->UpdateMaxPageID(curr_instance->max_page_id());
- return new_instance;
- }
+ // If the entry has an instance already we should use it.
+ if (entry.site_instance())
return entry.site_instance();
- }
// (UGLY) HEURISTIC, process-per-site only:
//

Powered by Google App Engine
This is Rietveld 408576698