diff options
| author | creis@google.com <creis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-29 16:35:45 +0000 |
|---|---|---|
| committer | creis@google.com <creis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-29 16:35:45 +0000 |
| commit | 4e1fd027999bf8148458d5c14ac6345d79227cfd (patch) | |
| tree | 5fc9605292b074776e2fedf9e603f031bd0871d7 /chrome/browser | |
| parent | 880969104ae3f1558340ceeac3a72e987a0c5aab (diff) | |
| download | chromium_src-4e1fd027999bf8148458d5c14ac6345d79227cfd.zip chromium_src-4e1fd027999bf8148458d5c14ac6345d79227cfd.tar.gz chromium_src-4e1fd027999bf8148458d5c14ac6345d79227cfd.tar.bz2 | |
Makes the process model heuristic for generated searches only apply in --process-per-site, since it isn't relevant otherwise. (This matters now that process-per-site-instance is the default.)
BUG=1256259
TEST=Visit a non-Google page, then run a search from the location bar. The tab should switch renderer processes.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/web_contents.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/web_contents.cc b/chrome/browser/web_contents.cc index d86d5f4..0111b9e 100644 --- a/chrome/browser/web_contents.cc +++ b/chrome/browser/web_contents.cc @@ -860,7 +860,7 @@ SiteInstance* WebContents::GetSiteInstanceForEntry( if (entry.site_instance()) return entry.site_instance(); - // (UGLY) HEURISTIC: + // (UGLY) HEURISTIC, process-per-site only: // // If this navigation is generated, then it probably corresponds to a search // query. Given that search results typically lead to users navigating to @@ -870,7 +870,8 @@ SiteInstance* WebContents::GetSiteInstanceForEntry( // NOTE: This can be removed once we have a way to transition between // RenderViews in response to a link click. // - if (entry.GetTransitionType() == PageTransition::GENERATED) + if (CommandLine().HasSwitch(switches::kProcessPerSite) && + entry.GetTransitionType() == PageTransition::GENERATED) return curr_instance; const GURL& dest_url = entry.GetURL(); |