Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10102)

Unified Diff: content/browser/browsing_instance.cc

Issue 7346024: Get rid of the ProfileId. It was added for ceee. I reverted the original change, since it led to ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/browsing_instance.h ('k') | content/browser/site_instance_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browsing_instance.cc
===================================================================
--- content/browser/browsing_instance.cc (revision 92309)
+++ content/browser/browsing_instance.cc (working copy)
@@ -60,9 +60,7 @@
// Otherwise, process-per-site is in use, at least for this URL. Look up the
// global map for this profile, creating an entry if necessary.
- ProfileId runtime_id = profile ? profile->GetRuntimeId()
- : Profile::kInvalidProfileId;
- return &profile_site_instance_map_[runtime_id];
+ return &profile_site_instance_map_[profile];
}
bool BrowsingInstance::HasSiteInstance(const GURL& url) {
@@ -127,10 +125,8 @@
// the site was put into when it was originally registered.
if (!RemoveSiteInstanceFromMap(&site_instance_map_, site, site_instance)) {
// Wasn't in our local map, so look in the static per-profile map.
- ProfileId runtime_id = profile_ ? profile_->GetRuntimeId()
- : Profile::kInvalidProfileId;
RemoveSiteInstanceFromMap(
- &profile_site_instance_map_[runtime_id], site, site_instance);
+ &profile_site_instance_map_[profile_], site, site_instance);
}
}
« no previous file with comments | « content/browser/browsing_instance.h ('k') | content/browser/site_instance_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698