From 4930760d08e0d3afef5e99684fc7450b15d0cf78 Mon Sep 17 00:00:00 2001 From: "hclam@chromium.org" Date: Fri, 25 Jun 2010 06:46:10 +0000 Subject: Revert r50779 as it breaks memory tests TBR=asargent@chromium.org TEST=Tree goes green Review URL: http://codereview.chromium.org/2812025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50828 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/common/extensions/extension_resource.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'chrome/common/extensions/extension_resource.h') diff --git a/chrome/common/extensions/extension_resource.h b/chrome/common/extensions/extension_resource.h index 295754e..8856414 100644 --- a/chrome/common/extensions/extension_resource.h +++ b/chrome/common/extensions/extension_resource.h @@ -5,8 +5,6 @@ #ifndef CHROME_COMMON_EXTENSIONS_EXTENSION_RESOURCE_H_ #define CHROME_COMMON_EXTENSIONS_EXTENSION_RESOURCE_H_ -#include - #include "base/file_path.h" #include "base/platform_thread.h" @@ -18,8 +16,7 @@ class ExtensionResource { public: ExtensionResource(); - ExtensionResource(const std::string& extension_id, - const FilePath& extension_root, + ExtensionResource(const FilePath& extension_root, const FilePath& relative_path); // Returns actual path to the resource (default or locale specific). In the @@ -54,20 +51,14 @@ class ExtensionResource { static void CheckFileAccessFromFileThread(); // Getters - const std::string& extension_id() const { return extension_id_; } const FilePath& extension_root() const { return extension_root_; } const FilePath& relative_path() const { return relative_path_; } - bool empty() { return extension_root().empty(); } - // Unit test helpers. FilePath::StringType NormalizeSeperators(FilePath::StringType path) const; bool ComparePathWithDefault(const FilePath& path) const; private: - // The id of the extension that this resource is associated with. - std::string extension_id_; - // Extension root. FilePath extension_root_; -- cgit v1.1