diff options
| author | siggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-25 17:38:01 +0000 |
|---|---|---|
| committer | siggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-25 17:38:01 +0000 |
| commit | 49952775c67f130e37d3d892f17657f56efbbe7a (patch) | |
| tree | e93642b101ec2b71a06eb2fff69ecd5e8099c736 /base | |
| parent | e9bb5b26b9d6308f4098a6b6b379c564a3b1f4be (diff) | |
| download | chromium_src-49952775c67f130e37d3d892f17657f56efbbe7a.zip chromium_src-49952775c67f130e37d3d892f17657f56efbbe7a.tar.gz chromium_src-49952775c67f130e37d3d892f17657f56efbbe7a.tar.bz2 | |
Check if the frame belongs to the browser tree associated with the BHO before commiting to creating and binding handlers.
Also, replace CComPtr with ScopedPtrHandler.
Committing for motek@google.com, original review at http://codereview.chromium.org/5311003/.
TEST=unittests in change.
BUG=3205224
BUG=3166440
Review URL: http://codereview.chromium.org/5360003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67415 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/win/scoped_comptr.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/base/win/scoped_comptr.h b/base/win/scoped_comptr.h index b65aaff..6375218 100644 --- a/base/win/scoped_comptr.h +++ b/base/win/scoped_comptr.h @@ -82,6 +82,11 @@ class ScopedComPtr : public scoped_refptr<Interface> { return &ptr_; } + // A convenience for whenever a void pointer is needed as an out argument. + void** ReceiveVoid() { + return reinterpret_cast<void**>(Receive()); + } + template <class Query> HRESULT QueryInterface(Query** p) { DCHECK(p != NULL); |