summaryrefslogtreecommitdiffstats
path: root/chrome/common/extensions/extension_resource.h
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-25 06:46:10 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-25 06:46:10 +0000
commit4930760d08e0d3afef5e99684fc7450b15d0cf78 (patch)
treed4d02e538c145096e8ba74bc8cb34a72a6d83647 /chrome/common/extensions/extension_resource.h
parent022a8ca1d96755b98c26c6211968415fe7c2f458 (diff)
downloadchromium_src-4930760d08e0d3afef5e99684fc7450b15d0cf78.zip
chromium_src-4930760d08e0d3afef5e99684fc7450b15d0cf78.tar.gz
chromium_src-4930760d08e0d3afef5e99684fc7450b15d0cf78.tar.bz2
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
Diffstat (limited to 'chrome/common/extensions/extension_resource.h')
-rw-r--r--chrome/common/extensions/extension_resource.h11
1 files changed, 1 insertions, 10 deletions
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 <string>
-
#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_;