Index: chrome/browser/extensions/extension_process_manager.cc |
=================================================================== |
--- chrome/browser/extensions/extension_process_manager.cc (revision 118703) |
+++ chrome/browser/extensions/extension_process_manager.cc (working copy) |
@@ -22,11 +22,11 @@ |
#include "chrome/common/extensions/extension.h" |
#include "chrome/common/url_constants.h" |
#include "content/browser/renderer_host/render_view_host.h" |
-#include "content/browser/site_instance.h" |
#include "content/public/browser/browser_thread.h" |
#include "content/public/browser/notification_service.h" |
#include "content/public/browser/render_process_host.h" |
#include "content/public/browser/render_view_host_delegate.h" |
+#include "content/public/browser/site_instance.h" |
#include "content/public/browser/web_contents.h" |
#include "content/public/common/renderer_preferences.h" |
@@ -50,7 +50,7 @@ |
content::ViewType view_type) OVERRIDE; |
virtual void CreateBackgroundHost(const Extension* extension, |
const GURL& url); |
- virtual SiteInstance* GetSiteInstanceForURL(const GURL& url); |
+ virtual content::SiteInstance* GetSiteInstanceForURL(const GURL& url); |
private: |
// content::NotificationObserver: |
@@ -96,7 +96,7 @@ |
} |
ExtensionProcessManager::ExtensionProcessManager(Profile* profile) |
- : site_instance_(SiteInstance::CreateSiteInstance(profile)) { |
+ : site_instance_(content::SiteInstance::CreateSiteInstance(profile)) { |
Profile* original_profile = profile->GetOriginalProfile(); |
registrar_.Add(this, chrome::NOTIFICATION_EXTENSIONS_READY, |
content::Source<Profile>(original_profile)); |
@@ -256,7 +256,7 @@ |
const std::string& extension_id) { |
std::set<RenderViewHost*> result; |
- SiteInstance* site_instance = GetSiteInstanceForURL( |
+ content::SiteInstance* site_instance = GetSiteInstanceForURL( |
Extension::GetBaseURLFromExtensionId(extension_id)); |
if (!site_instance) |
return result; |
@@ -282,7 +282,8 @@ |
all_extension_views_.erase(render_view_host); |
} |
-SiteInstance* ExtensionProcessManager::GetSiteInstanceForURL(const GURL& url) { |
+content::SiteInstance* ExtensionProcessManager::GetSiteInstanceForURL( |
+ const GURL& url) { |
return site_instance_->GetRelatedSiteInstance(url); |
} |
@@ -305,7 +306,7 @@ |
for (std::set<RenderViewHost*>::const_iterator it = views.begin(); |
it != views.end(); ++it) { |
const RenderViewHost* host = *it; |
- if (host->site_instance()->site().host() == extension_id && |
+ if (host->site_instance()->GetSite().host() == extension_id && |
host->delegate()->GetRenderViewType() != |
chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) { |
return true; |
@@ -456,7 +457,7 @@ |
} |
} |
-SiteInstance* IncognitoExtensionProcessManager::GetSiteInstanceForURL( |
+content::SiteInstance* IncognitoExtensionProcessManager::GetSiteInstanceForURL( |
const GURL& url) { |
ExtensionService* service = GetProfile()->GetExtensionService(); |
if (service) { |