| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #ifndef REMOTING_CLIENT_X11_VIEW_H_ | 5 #ifndef REMOTING_CLIENT_X11_VIEW_H_ |
| 6 #define REMOTING_CLIENT_X11_VIEW_H_ | 6 #define REMOTING_CLIENT_X11_VIEW_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/scoped_ptr.h" | 9 #include "base/scoped_ptr.h" |
| 10 #include "media/base/video_frame.h" | 10 #include "media/base/video_frame.h" |
| 11 #include "remoting/client/decoder.h" | 11 #include "remoting/base/decoder.h" |
| 12 #include "remoting/client/chromoting_view.h" | 12 #include "remoting/client/chromoting_view.h" |
| 13 | 13 |
| 14 typedef unsigned long XID; | 14 typedef unsigned long XID; |
| 15 typedef struct _XDisplay Display; | 15 typedef struct _XDisplay Display; |
| 16 | 16 |
| 17 namespace remoting { | 17 namespace remoting { |
| 18 | 18 |
| 19 // A ChromotingView implemented using X11 and XRender. | 19 // A ChromotingView implemented using X11 and XRender. |
| 20 class X11View : public ChromotingView { | 20 class X11View : public ChromotingView { |
| 21 public: | 21 public: |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 scoped_ptr<Decoder> decoder_; | 59 scoped_ptr<Decoder> decoder_; |
| 60 | 60 |
| 61 DISALLOW_COPY_AND_ASSIGN(X11View); | 61 DISALLOW_COPY_AND_ASSIGN(X11View); |
| 62 }; | 62 }; |
| 63 | 63 |
| 64 } // namespace remoting | 64 } // namespace remoting |
| 65 | 65 |
| 66 DISABLE_RUNNABLE_METHOD_REFCOUNT(remoting::X11View); | 66 DISABLE_RUNNABLE_METHOD_REFCOUNT(remoting::X11View); |
| 67 | 67 |
| 68 #endif // REMOTING_CLIENT_X11_VIEW_H_ | 68 #endif // REMOTING_CLIENT_X11_VIEW_H_ |
| OLD | NEW |