diff options
| author | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-08 20:37:43 +0000 |
|---|---|---|
| committer | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-08 20:37:43 +0000 |
| commit | a7664e14960e48758f985b4de48607cb197b78b6 (patch) | |
| tree | 9d7083e85f65bc4798c48e4effc437feae0df7c1 /chrome/browser/extensions/extension_function.cc | |
| parent | 01a22e2616272096c5f83bff8183ae48ec5e8380 (diff) | |
| download | chromium_src-a7664e14960e48758f985b4de48607cb197b78b6.zip chromium_src-a7664e14960e48758f985b4de48607cb197b78b6.tar.gz chromium_src-a7664e14960e48758f985b4de48607cb197b78b6.tar.bz2 | |
Move GetExtension() from ExtensionFunctionDispatcher to ExtensionFunction.
EFD's can expire during the processing of AsyncExtensionFunctions, so this change enables them to retain access to their extension to complete their work.
This fixes a bug in executeScript where when a file source was used, but the call was made from a popup which which had closed, by the time the file source was loaded, the EFD had been destroyed. Go boom.
BUG=32431
TEST=All tests should pass
Review URL: http://codereview.chromium.org/1549026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43999 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_function.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_function.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/chrome/browser/extensions/extension_function.cc b/chrome/browser/extensions/extension_function.cc index f319315..f3c3532 100644 --- a/chrome/browser/extensions/extension_function.cc +++ b/chrome/browser/extensions/extension_function.cc @@ -37,13 +37,3 @@ bool AsyncExtensionFunction::HasOptionalArgument(size_t index) { Value* value; return args_list->Get(index, &value) && !value->IsType(Value::TYPE_NULL); } - -std::string AsyncExtensionFunction::extension_id() { - DCHECK(dispatcher()); - return dispatcher()->extension_id(); -} - -Profile* AsyncExtensionFunction::profile() const { - DCHECK(dispatcher()); - return dispatcher()->profile(); -} |