summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-16 00:22:48 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-16 00:22:48 +0000
commitd83a560943d1fdfcf9ec46ea001248a46e6148a7 (patch)
treec046a2757bbeb25c42f2f6af300cd4098289c715 /net
parent63692215e10b693db53a395a9fdefd77cf3a6fc6 (diff)
downloadchromium_src-d83a560943d1fdfcf9ec46ea001248a46e6148a7.zip
chromium_src-d83a560943d1fdfcf9ec46ea001248a46e6148a7.tar.gz
chromium_src-d83a560943d1fdfcf9ec46ea001248a46e6148a7.tar.bz2
FBTF: Move Extension::LaunchContainer to extension_constants.h.
This makes browser.h not depend on extension.h. BUG=none TEST=compiles Review URL: http://codereview.chromium.org/3399008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59588 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/disk_cache/backend_impl.cc4
-rw-r--r--net/disk_cache/backend_impl.h4
2 files changed, 5 insertions, 3 deletions
diff --git a/net/disk_cache/backend_impl.cc b/net/disk_cache/backend_impl.cc
index 4b8e361..c52a853 100644
--- a/net/disk_cache/backend_impl.cc
+++ b/net/disk_cache/backend_impl.cc
@@ -1093,6 +1093,10 @@ std::string BackendImpl::HistogramName(const char* name, int experiment) const {
return StringPrintf("DiskCache.%d.%s_%d", cache_type_, name, experiment);
}
+base::WeakPtr<BackendImpl> BackendImpl::GetWeakPtr() {
+ return ptr_factory_.GetWeakPtr();
+}
+
int BackendImpl::GetSizeGroup() const {
if (disabled_)
return 0;
diff --git a/net/disk_cache/backend_impl.h b/net/disk_cache/backend_impl.h
index 6aff0e2..58321be 100644
--- a/net/disk_cache/backend_impl.h
+++ b/net/disk_cache/backend_impl.h
@@ -185,9 +185,7 @@ class BackendImpl : public Backend {
}
// Returns a weak pointer to this object.
- base::WeakPtr<BackendImpl> GetWeakPtr() {
- return ptr_factory_.GetWeakPtr();
- }
+ base::WeakPtr<BackendImpl> GetWeakPtr();
// Returns the group for this client, based on the current cache size.
int GetSizeGroup() const;