diff options
| author | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-03 23:03:06 +0000 |
|---|---|---|
| committer | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-03 23:03:06 +0000 |
| commit | 95df17a8375f6f21b5e08491f723b39610f7f294 (patch) | |
| tree | 4fedcbc1a26b2a94711385feb0cc08cd770a3c51 /content | |
| parent | 6efddb457767a3c88ef8be5390f9cba9ea7d2643 (diff) | |
| download | chromium_src-95df17a8375f6f21b5e08491f723b39610f7f294.zip chromium_src-95df17a8375f6f21b5e08491f723b39610f7f294.tar.gz chromium_src-95df17a8375f6f21b5e08491f723b39610f7f294.tar.bz2 | |
Don't reload into an app process.
NavigationEntries are not safe to move from one process to another.
BUG=80621,102408
TEST=Reload a page after installing it as an app. No process swap.
Review URL: http://codereview.chromium.org/8443005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108571 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/tab_contents/navigation_entry.h | 2 | ||||
| -rw-r--r-- | content/browser/tab_contents/render_view_host_manager.cc | 12 |
2 files changed, 4 insertions, 10 deletions
diff --git a/content/browser/tab_contents/navigation_entry.h b/content/browser/tab_contents/navigation_entry.h index 5f729c5..eea3f35 100644 --- a/content/browser/tab_contents/navigation_entry.h +++ b/content/browser/tab_contents/navigation_entry.h @@ -209,7 +209,7 @@ class CONTENT_EXPORT NavigationEntry { // // Note that the SiteInstance should usually not be changed after it is set, // but this may happen if the NavigationEntry was cloned and needs to use a - // different SiteInstance, or if a hosted app is installed or uninstalled. + // different SiteInstance. void set_site_instance(SiteInstance* site_instance); SiteInstance* site_instance() const { return site_instance_; diff --git a/content/browser/tab_contents/render_view_host_manager.cc b/content/browser/tab_contents/render_view_host_manager.cc index 2627862..61b084b 100644 --- a/content/browser/tab_contents/render_view_host_manager.cc +++ b/content/browser/tab_contents/render_view_host_manager.cc @@ -387,15 +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)) - return curr_instance->GetRelatedSiteInstance(dest_url); - else - return entry.site_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: // |