diff options
| author | asargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 23:20:15 +0000 |
|---|---|---|
| committer | asargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 23:20:15 +0000 |
| commit | 06a0c94e817354c8c12afe4748ce68a418b0ed1b (patch) | |
| tree | 44a301796ccb8a0808eb77b10292de60cf04fcf4 /chrome/common/extensions/extension_resource.cc | |
| parent | 8ab402196ee4dc510e0162010789d43b96b54243 (diff) | |
| download | chromium_src-06a0c94e817354c8c12afe4748ce68a418b0ed1b.zip chromium_src-06a0c94e817354c8c12afe4748ce68a418b0ed1b.tar.gz chromium_src-06a0c94e817354c8c12afe4748ce68a418b0ed1b.tar.bz2 | |
Show extension icons next to their top-level context menu items.
Also fix a bug in extension icon caching where we weren't keeping track of
potential resizing done by ImageLoadingTracker before setting the cached
SkBitmap.
BUG=39494
TEST=Install an extension that includes an icon and uses the experimental
context menu API. You should see the extension's icon in the context menu
next to its top-level item.
Review URL: http://codereview.chromium.org/2867008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50779 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) { } |