diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-18 13:39:02 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-18 13:39:02 +0000 |
| commit | 72daaa97d67f7c722eaf9eabf125427506ee8d45 (patch) | |
| tree | 23e2d82b58b9e48061283ba6f2045f4b3864b668 /content/browser/browsing_instance.cc | |
| parent | 9e855c0a40e07fa78d9abb4961b35e750627caf4 (diff) | |
| download | chromium_src-72daaa97d67f7c722eaf9eabf125427506ee8d45.zip chromium_src-72daaa97d67f7c722eaf9eabf125427506ee8d45.tar.gz chromium_src-72daaa97d67f7c722eaf9eabf125427506ee8d45.tar.bz2 | |
Hide BrowsingInstance from all but SiteInstance, as intended by design.
See comment on BrowsingInstance class that explains it should only be
visible to SiteInstance. By restoring this design, we also eliminate
one Chrome->Content dependency.
TBR=ben@chromium.org
BUG=98716
Review URL: http://codereview.chromium.org/9221017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118090 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browsing_instance.cc')
| -rw-r--r-- | content/browser/browsing_instance.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/browser/browsing_instance.cc b/content/browser/browsing_instance.cc index 3003f92..4809dd76 100644 --- a/content/browser/browsing_instance.cc +++ b/content/browser/browsing_instance.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -97,7 +97,7 @@ SiteInstance* BrowsingInstance::GetSiteInstanceForURL(const GURL& url) { } void BrowsingInstance::RegisterSiteInstance(SiteInstance* site_instance) { - DCHECK(site_instance->browsing_instance() == this); + DCHECK(site_instance->browsing_instance_ == this); DCHECK(site_instance->has_site()); std::string site = site_instance->site().possibly_invalid_spec(); @@ -116,7 +116,7 @@ void BrowsingInstance::RegisterSiteInstance(SiteInstance* site_instance) { } void BrowsingInstance::UnregisterSiteInstance(SiteInstance* site_instance) { - DCHECK(site_instance->browsing_instance() == this); + DCHECK(site_instance->browsing_instance_ == this); DCHECK(site_instance->has_site()); std::string site = site_instance->site().possibly_invalid_spec(); |