diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 07:25:52 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 07:25:52 +0000 |
| commit | 052c92700b2c71e60ab89e765467b9b0926d0f7c (patch) | |
| tree | cc5181425481f5728bdcdda9933449007bd64b46 /chrome/common/extensions/extension_resource.cc | |
| parent | 16f17f5edd89d6b6a41709a9946a0183f5754c35 (diff) | |
| download | chromium_src-052c92700b2c71e60ab89e765467b9b0926d0f7c.zip chromium_src-052c92700b2c71e60ab89e765467b9b0926d0f7c.tar.gz chromium_src-052c92700b2c71e60ab89e765467b9b0926d0f7c.tar.bz2 | |
Revert "Revert "Show extension icons next to their top-level context menu items.""
This reverts r50828 as the error is already suppressed r50793.
TBR=asargent
Review URL: http://codereview.chromium.org/2844028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50831 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/extension_resource.cc')
| -rw-r--r-- | chrome/common/extensions/extension_resource.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/common/extensions/extension_resource.cc b/chrome/common/extensions/extension_resource.cc index eb5b3626..d3c5898 100644 --- a/chrome/common/extensions/extension_resource.cc +++ b/chrome/common/extensions/extension_resource.cc @@ -14,9 +14,11 @@ bool ExtensionResource::check_for_file_thread_ = false; ExtensionResource::ExtensionResource() { } -ExtensionResource::ExtensionResource(const FilePath& extension_root, +ExtensionResource::ExtensionResource(const std::string& extension_id, + const FilePath& extension_root, const FilePath& relative_path) - : extension_root_(extension_root), + : extension_id_(extension_id), + extension_root_(extension_root), relative_path_(relative_path) { } |