diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-12 09:40:50 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-12 09:40:50 +0000 |
| commit | b4acaf8b4e3092096deebc23f1b60bea0773379a (patch) | |
| tree | 91fb0223e6c27e1c4675720d78e80b5c3b133812 /mojo | |
| parent | ab3ed7e4ac3fbe6666f2c0009642b30563fc20d6 (diff) | |
| download | chromium_src-b4acaf8b4e3092096deebc23f1b60bea0773379a.zip chromium_src-b4acaf8b4e3092096deebc23f1b60bea0773379a.tar.gz chromium_src-b4acaf8b4e3092096deebc23f1b60bea0773379a.tar.bz2 | |
[gin] Declare a wrappable's kWrapperInfo on the class deriving from Wrappable
Otherwise, we need to put INIT_WRAPPABLE() in namespace gin no matter
where the derived class is declared.
I pulled this out from https://codereview.chromium.org/111083005/
BUG=none
R=dcarney@chromium.org
TBR=aa@chromium.org
Review URL: https://codereview.chromium.org/113163007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240271 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/apps/js/bindings/waiting_callback.cc | 4 | ||||
| -rw-r--r-- | mojo/apps/js/bindings/waiting_callback.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mojo/apps/js/bindings/waiting_callback.cc b/mojo/apps/js/bindings/waiting_callback.cc index 48166d1..7537806 100644 --- a/mojo/apps/js/bindings/waiting_callback.cc +++ b/mojo/apps/js/bindings/waiting_callback.cc @@ -7,8 +7,6 @@ #include "gin/per_context_data.h" #include "gin/per_isolate_data.h" -INIT_WRAPPABLE(mojo::js::WaitingCallback); - namespace mojo { namespace js { @@ -20,6 +18,8 @@ v8::Handle<v8::String> GetHiddenPropertyName(v8::Isolate* isolate) { } // namespace +gin::WrapperInfo WaitingCallback::kWrapperInfo = { gin::kEmbedderNativeGin }; + WaitingCallback::WaitingCallback(v8::Isolate* isolate, v8::Handle<v8::Function> callback) : wait_id_() { diff --git a/mojo/apps/js/bindings/waiting_callback.h b/mojo/apps/js/bindings/waiting_callback.h index 8bc7628..55c9b3e 100644 --- a/mojo/apps/js/bindings/waiting_callback.h +++ b/mojo/apps/js/bindings/waiting_callback.h @@ -16,6 +16,8 @@ namespace js { class WaitingCallback : public gin::Wrappable<WaitingCallback>, public BindingsSupport::AsyncWaitCallback { public: + static gin::WrapperInfo kWrapperInfo; + static gin::Handle<WaitingCallback> Create( v8::Isolate* isolate, v8::Handle<v8::Function> callback); |