diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-13 18:17:18 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-13 18:17:18 +0000 |
| commit | 67351452e1e16cb9b01c609ce185a9e819cf2254 (patch) | |
| tree | 23a1b83b3428a729472a938a48ba9c5a1cf5c812 /content/browser/browsing_instance.h | |
| parent | 66bc3e9561541e0a24e6c5dac7e87af5d1403c54 (diff) | |
| download | chromium_src-67351452e1e16cb9b01c609ce185a9e819cf2254.zip chromium_src-67351452e1e16cb9b01c609ce185a9e819cf2254.tar.gz chromium_src-67351452e1e16cb9b01c609ce185a9e819cf2254.tar.bz2 | |
Get rid of the ProfileId. It was added for ceee. I reverted the original change, since it led to Profile being used in content unnecessarily. I also removed the extensions usage of it and instead kept a void*.
BUG=76788
Review URL: http://codereview.chromium.org/7346024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92382 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browsing_instance.h')
| -rw-r--r-- | content/browser/browsing_instance.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/content/browser/browsing_instance.h b/content/browser/browsing_instance.h index 18d28a6..f26eb55 100644 --- a/content/browser/browsing_instance.h +++ b/content/browser/browsing_instance.h @@ -8,9 +8,9 @@ #include "base/hash_tables.h" #include "base/memory/ref_counted.h" -#include "chrome/browser/profiles/profile.h" class GURL; +class Profile; class SiteInstance; /////////////////////////////////////////////////////////////////////////////// @@ -93,13 +93,11 @@ class BrowsingInstance : public base::RefCounted<BrowsingInstance> { private: // Map of site to SiteInstance, to ensure we only have one SiteInstance per - // site. The site string should be the possibly_invalid_spec() of a GURL - // obtained with SiteInstance::GetSiteForURL. typedef base::hash_map<std::string, SiteInstance*> SiteInstanceMap; - // Map of Profile runtime Id to SiteInstanceMap, for use in the + // Map of Profile to SiteInstanceMap, for use in the process-per-site model. // process-per-site model. - typedef base::hash_map<ProfileId, SiteInstanceMap> ProfileSiteInstanceMap; + typedef base::hash_map<Profile*, SiteInstanceMap> ProfileSiteInstanceMap; // Returns a pointer to the relevant SiteInstanceMap for this object. If the // process-per-site model is in use, or if process-per-site-instance is in |