From 8df905e2ff5ffad361b2c9eba9ae549c87c37c06 Mon Sep 17 00:00:00 2001 From: "rsleevi@chromium.org" Date: Mon, 25 Jun 2012 08:15:42 +0000 Subject: RefCounted types should not have public destructors Change content::ResourceResponse to be base::RefCountedData<> rather than directly inheriting from both ResourceResponseHead and base::RefCounted. BUG=123295 TEST=existing Review URL: https://chromiumcodereview.appspot.com/10416003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143880 0039d316-1c4b-4281-b951-d872f2087c98 --- content/public/common/resource_response.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'content/public/common/resource_response.h') diff --git a/content/public/common/resource_response.h b/content/public/common/resource_response.h index 9a8e3a8..b6c4eaa 100644 --- a/content/public/common/resource_response.h +++ b/content/public/common/resource_response.h @@ -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. @@ -39,13 +39,14 @@ struct SyncLoadResult : ResourceResponseHead { }; // Simple wrapper that refcounts ResourceResponseHead. +// Inherited, rather than typedef'd, to allow forward declarations. struct CONTENT_EXPORT ResourceResponse - : public NON_EXPORTED_BASE(ResourceResponseHead), - public base::RefCounted { + : public base::RefCounted { + public: + ResourceResponseHead head; private: friend class base::RefCounted; - ~ResourceResponse() {} }; -- cgit v1.1