| OLD | NEW |
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "mojo/bindings/js/waiting_callback.h" | 5 #include "mojo/edk/js/waiting_callback.h" |
| 6 | 6 |
| 7 #include "gin/per_context_data.h" | 7 #include "gin/per_context_data.h" |
| 8 #include "mojo/public/cpp/environment/environment.h" | 8 #include "mojo/public/cpp/environment/environment.h" |
| 9 | 9 |
| 10 namespace mojo { | 10 namespace mojo { |
| 11 namespace js { | 11 namespace js { |
| 12 | 12 |
| 13 namespace { | 13 namespace { |
| 14 | 14 |
| 15 v8::Handle<v8::String> GetHiddenPropertyName(v8::Isolate* isolate) { | 15 v8::Handle<v8::String> GetHiddenPropertyName(v8::Isolate* isolate) { |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 runner_->Call(callback, runner_->global(), 1, args); | 86 runner_->Call(callback, runner_->global(), 1, args); |
| 87 } | 87 } |
| 88 | 88 |
| 89 void WaitingCallback::OnWillCloseHandle() { | 89 void WaitingCallback::OnWillCloseHandle() { |
| 90 Environment::GetDefaultAsyncWaiter()->CancelWait(wait_id_); | 90 Environment::GetDefaultAsyncWaiter()->CancelWait(wait_id_); |
| 91 OnHandleReady(MOJO_RESULT_INVALID_ARGUMENT); | 91 OnHandleReady(MOJO_RESULT_INVALID_ARGUMENT); |
| 92 } | 92 } |
| 93 | 93 |
| 94 } // namespace js | 94 } // namespace js |
| 95 } // namespace mojo | 95 } // namespace mojo |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 703273002:
Update mojo sdk to rev 04a510fb37db10642e156957f9b2c11c2f6442ac (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master