Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "remoting/host/host_script_object.h" | 5 #include "remoting/host/plugin/host_script_object.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
| 9 #include "base/task.h" | 9 #include "base/task.h" |
| 10 #include "base/threading/platform_thread.h" | 10 #include "base/threading/platform_thread.h" |
| 11 #include "remoting/base/auth_token_util.h" | 11 #include "remoting/base/auth_token_util.h" |
| 12 #include "remoting/host/chromoting_host.h" | 12 #include "remoting/host/chromoting_host.h" |
| 13 #include "remoting/host/chromoting_host_context.h" | 13 #include "remoting/host/chromoting_host_context.h" |
| 14 #include "remoting/host/host_config.h" | 14 #include "remoting/host/host_config.h" |
| 15 #include "remoting/host/host_key_pair.h" | 15 #include "remoting/host/host_key_pair.h" |
| 16 #include "remoting/host/host_plugin_utils.h" | |
| 17 #include "remoting/host/in_memory_host_config.h" | 16 #include "remoting/host/in_memory_host_config.h" |
| 18 #include "remoting/host/register_support_host_request.h" | 17 #include "remoting/host/register_support_host_request.h" |
| 19 #include "remoting/host/support_access_verifier.h" | 18 #include "remoting/host/support_access_verifier.h" |
| 19 #include "remoting/host/plugin/host_plugin_utils.h" | |
|
Sergey Ulanov
2011/06/21 18:19:31
this should be before register_support_host_reques
| |
| 20 | 20 |
| 21 namespace remoting { | 21 namespace remoting { |
| 22 | 22 |
| 23 // Supported Javascript interface: | 23 // Supported Javascript interface: |
| 24 // readonly attribute string accessCode; | 24 // readonly attribute string accessCode; |
| 25 // readonly attribute int state; | 25 // readonly attribute int state; |
| 26 // | 26 // |
| 27 // state: { | 27 // state: { |
| 28 // DISCONNECTED, | 28 // DISCONNECTED, |
| 29 // REQUESTED_ACCESS_CODE, | 29 // REQUESTED_ACCESS_CODE, |
| (...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 514 task); | 514 task); |
| 515 } | 515 } |
| 516 | 516 |
| 517 void HostNPScriptObject::NPTaskSpringboard(void* task) { | 517 void HostNPScriptObject::NPTaskSpringboard(void* task) { |
| 518 Task* real_task = reinterpret_cast<Task*>(task); | 518 Task* real_task = reinterpret_cast<Task*>(task); |
| 519 real_task->Run(); | 519 real_task->Run(); |
| 520 delete real_task; | 520 delete real_task; |
| 521 } | 521 } |
| 522 | 522 |
| 523 } // namespace remoting | 523 } // namespace remoting |
| OLD | NEW |