diff options
Diffstat (limited to 'chromium/content/browser/site_instance_impl.cc')
| -rw-r--r-- | chromium/content/browser/site_instance_impl.cc | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/chromium/content/browser/site_instance_impl.cc b/chromium/content/browser/site_instance_impl.cc index c003eb73484..b6e6918c0a4 100644 --- a/chromium/content/browser/site_instance_impl.cc +++ b/chromium/content/browser/site_instance_impl.cc @@ -104,11 +104,8 @@ RenderProcessHost* SiteInstanceImpl::GetProcess() { StoragePartitionImpl* partition = static_cast<StoragePartitionImpl*>( BrowserContext::GetStoragePartition(browser_context, this)); - bool supports_browser_plugin = GetContentClient()->browser()-> - SupportsBrowserPlugin(browser_context, site_); process_ = new RenderProcessHostImpl(browser_context, partition, - supports_browser_plugin, site_.SchemeIs(kGuestScheme)); } } @@ -185,6 +182,10 @@ bool SiteInstanceImpl::IsRelatedSiteInstance(const SiteInstance* instance) { instance)->browsing_instance_.get(); } +size_t SiteInstanceImpl::GetRelatedActiveContentsCount() { + return browsing_instance_->active_contents_count(); +} + bool SiteInstanceImpl::HasWrongProcessForURL(const GURL& url) { // Having no process isn't a problem, since we'll assign it correctly. // Note that HasProcess() may return true if process_ is null, in @@ -206,6 +207,14 @@ bool SiteInstanceImpl::HasWrongProcessForURL(const GURL& url) { GetProcess(), browsing_instance_->browser_context(), site_url); } +void SiteInstanceImpl::IncrementRelatedActiveContentsCount() { + browsing_instance_->increment_active_contents_count(); +} + +void SiteInstanceImpl::DecrementRelatedActiveContentsCount() { + browsing_instance_->decrement_active_contents_count(); +} + void SiteInstanceImpl::set_render_process_host_factory( const RenderProcessHostFactory* rph_factory) { g_render_process_host_factory_ = rph_factory; @@ -259,7 +268,7 @@ bool SiteInstance::IsSameWebSite(BrowserContext* browser_context, return net::registry_controlled_domains::SameDomainOrHost( url1, url2, - net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES); + net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES); } /*static*/ @@ -294,7 +303,7 @@ GURL SiteInstance::GetSiteForURL(BrowserContext* browser_context, std::string domain = net::registry_controlled_domains::GetDomainAndRegistry( url, - net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES); + net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES); if (!domain.empty()) { GURL::Replacements rep; rep.SetHostStr(domain); |