Chromium Code Reviews| Index: content/browser/site_instance.h |
| diff --git a/content/browser/site_instance.h b/content/browser/site_instance.h |
| index 4d3692ccd28306c422fdb8513183dc551b1af270..70422e8f48a9eacd75977d38015962a4018cb88e 100644 |
| --- a/content/browser/site_instance.h |
| +++ b/content/browser/site_instance.h |
| @@ -36,7 +36,7 @@ class BrowsingInstance; |
| // SiteInstance is used. |
| // |
| // In --process-per-site, we consolidate all SiteInstances for a given site, |
| -// throughout the entire profile. This ensures that only one process will be |
| +// throughout the entire context. This ensures that only one process will be |
| // dedicated to each site. |
| // |
| // Each NavigationEntry for a TabContents points to the SiteInstance that |
| @@ -119,18 +119,18 @@ class SiteInstance : public base::RefCounted<SiteInstance>, |
| // |
| // TODO(creis): This may be an argument to build a pass_refptr<T> class, as |
| // Darin suggests. |
| - static SiteInstance* CreateSiteInstance(Profile* profile); |
| + static SiteInstance* CreateSiteInstance(content::BrowserContext* context); |
|
jam
2011/07/22 16:58:38
browser_context in all this file
|
| // Factory method to get the appropriate SiteInstance for the given URL, in |
| // a new BrowsingInstance. Use this instead of CreateSiteInstance when you |
| // know the URL, since it allows special site grouping rules to be applied |
| // (for example, to group chrome-ui pages into the same instance). |
| - static SiteInstance* CreateSiteInstanceForURL(Profile* profile, |
| - const GURL& url); |
| + static SiteInstance* CreateSiteInstanceForURL( |
| + content::BrowserContext* context, const GURL& url); |
| // Returns the site for the given URL, which includes only the scheme and |
| // registered domain. Returns an empty GURL if the URL has no host. |
| - static GURL GetSiteForURL(Profile* profile, const GURL& url); |
| + static GURL GetSiteForURL(content::BrowserContext* context, const GURL& url); |
| // Return whether both URLs are part of the same web site, for the purpose of |
| // assigning them to processes accordingly. The decision is currently based |
| @@ -139,7 +139,7 @@ class SiteInstance : public base::RefCounted<SiteInstance>, |
| // the same process if they can communicate with other via JavaScript. |
| // (e.g., docs.google.com and mail.google.com have DOM access to each other |
| // if they both set their document.domain properties to google.com.) |
| - static bool IsSameWebSite(Profile* profile, |
| + static bool IsSameWebSite(content::BrowserContext* context, |
| const GURL& url1, const GURL& url2); |
| // Returns the renderer type for this URL. |
| @@ -158,7 +158,8 @@ class SiteInstance : public base::RefCounted<SiteInstance>, |
| explicit SiteInstance(BrowsingInstance* browsing_instance); |
| // Get the effective URL for the given actual URL. |
| - static GURL GetEffectiveURL(Profile* profile, const GURL& url); |
| + static GURL GetEffectiveURL(content::BrowserContext* context, |
| + const GURL& url); |
| // Returns the type of renderer process this instance belongs in, for grouping |
| // purposes. |