| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/client/plugin/chromoting_instance.h" | 5 #include "remoting/client/plugin/chromoting_instance.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #if defined(OS_NACL) | 10 #if defined(OS_NACL) |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 #include "ppapi/cpp/completion_callback.h" | 31 #include "ppapi/cpp/completion_callback.h" |
| 32 #include "ppapi/cpp/dev/url_util_dev.h" | 32 #include "ppapi/cpp/dev/url_util_dev.h" |
| 33 #include "ppapi/cpp/image_data.h" | 33 #include "ppapi/cpp/image_data.h" |
| 34 #include "ppapi/cpp/input_event.h" | 34 #include "ppapi/cpp/input_event.h" |
| 35 #include "ppapi/cpp/rect.h" | 35 #include "ppapi/cpp/rect.h" |
| 36 #include "ppapi/cpp/var_array_buffer.h" | 36 #include "ppapi/cpp/var_array_buffer.h" |
| 37 #include "ppapi/cpp/var_dictionary.h" | 37 #include "ppapi/cpp/var_dictionary.h" |
| 38 #include "remoting/base/constants.h" | 38 #include "remoting/base/constants.h" |
| 39 #include "remoting/base/util.h" | 39 #include "remoting/base/util.h" |
| 40 #include "remoting/client/chromoting_client.h" | 40 #include "remoting/client/chromoting_client.h" |
| 41 #include "remoting/client/normalizing_input_filter_cros.h" |
| 42 #include "remoting/client/normalizing_input_filter_mac.h" |
| 41 #include "remoting/client/plugin/delegating_signal_strategy.h" | 43 #include "remoting/client/plugin/delegating_signal_strategy.h" |
| 42 #include "remoting/client/plugin/normalizing_input_filter_cros.h" | |
| 43 #include "remoting/client/plugin/normalizing_input_filter_mac.h" | |
| 44 #include "remoting/client/plugin/pepper_audio_player.h" | 44 #include "remoting/client/plugin/pepper_audio_player.h" |
| 45 #include "remoting/client/plugin/pepper_mouse_locker.h" | 45 #include "remoting/client/plugin/pepper_mouse_locker.h" |
| 46 #include "remoting/client/plugin/pepper_port_allocator.h" | 46 #include "remoting/client/plugin/pepper_port_allocator.h" |
| 47 #include "remoting/client/plugin/pepper_video_renderer_2d.h" | 47 #include "remoting/client/plugin/pepper_video_renderer_2d.h" |
| 48 #include "remoting/client/plugin/pepper_video_renderer_3d.h" | 48 #include "remoting/client/plugin/pepper_video_renderer_3d.h" |
| 49 #include "remoting/client/software_video_renderer.h" | 49 #include "remoting/client/software_video_renderer.h" |
| 50 #include "remoting/client/token_fetcher_proxy.h" | 50 #include "remoting/client/token_fetcher_proxy.h" |
| 51 #include "remoting/protocol/connection_to_host.h" | 51 #include "remoting/protocol/connection_to_host.h" |
| 52 #include "remoting/protocol/host_stub.h" | 52 #include "remoting/protocol/host_stub.h" |
| 53 #include "remoting/protocol/libjingle_transport_factory.h" | 53 #include "remoting/protocol/libjingle_transport_factory.h" |
| (...skipping 1142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1196 | 1196 |
| 1197 #if !defined(OS_NACL) | 1197 #if !defined(OS_NACL) |
| 1198 // Log messages are forwarded to the webapp only in PNaCl version of the | 1198 // Log messages are forwarded to the webapp only in PNaCl version of the |
| 1199 // plugin, so ProcessLogToUI() needs to be called explicitly in the non-PNaCl | 1199 // plugin, so ProcessLogToUI() needs to be called explicitly in the non-PNaCl |
| 1200 // version. | 1200 // version. |
| 1201 ProcessLogToUI(message); | 1201 ProcessLogToUI(message); |
| 1202 #endif // !defined(OS_NACL) | 1202 #endif // !defined(OS_NACL) |
| 1203 } | 1203 } |
| 1204 | 1204 |
| 1205 } // namespace remoting | 1205 } // namespace remoting |
| OLD | NEW |