diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-08 14:00:11 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-08 14:00:11 +0000 |
| commit | 4bf6afd4a6c3c6c506a2b846b4ebf0c2c3f27805 (patch) | |
| tree | 0293e2a7dbe89dfd0fb111cd9f0ecaee73d14155 /chrome/browser/browsing_instance.h | |
| parent | 2dd1eb91fa07a6ec9a708093525834d7eab5a95e (diff) | |
| download | chromium_src-4bf6afd4a6c3c6c506a2b846b4ebf0c2c3f27805.zip chromium_src-4bf6afd4a6c3c6c506a2b846b4ebf0c2c3f27805.tar.gz chromium_src-4bf6afd4a6c3c6c506a2b846b4ebf0c2c3f27805.tar.bz2 | |
Committing change 255087 for Roger:
TBR=amit
http://codereview.chromium.org/255087
Adding a unique runtime Id to Profile objects, that can be used as the key
of the ProfileSiteInstanceMap type. This is used to make sure that Profile
objects can correctly share site information when one profile is derived
from another.
BUG=0
TEST=See unit tests
Review URL: http://codereview.chromium.org/261012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28390 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browsing_instance.h')
| -rw-r--r-- | chrome/browser/browsing_instance.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/browsing_instance.h b/chrome/browser/browsing_instance.h index 27ef405..c067a0d 100644 --- a/chrome/browser/browsing_instance.h +++ b/chrome/browser/browsing_instance.h @@ -8,9 +8,9 @@ #include "base/hash_tables.h" #include "base/logging.h" #include "base/ref_counted.h" +#include "chrome/browser/profile.h" class GURL; -class Profile; class SiteInstance; /////////////////////////////////////////////////////////////////////////////// @@ -100,8 +100,9 @@ class BrowsingInstance : public base::RefCounted<BrowsingInstance> { // obtained with SiteInstance::GetSiteForURL. typedef base::hash_map<std::string, SiteInstance*> SiteInstanceMap; - // Map of Profile to SiteInstanceMap, for use in the process-per-site model. - typedef base::hash_map<Profile*, SiteInstanceMap> ProfileSiteInstanceMap; + // Map of Profile runtime Id to SiteInstanceMap, for use in the + // process-per-site model. + typedef base::hash_map<ProfileId, 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 |