Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(496)

Unified Diff: remoting/client/x11_view.h

Issue 3124005: Move UpdateStreamEncoding value into the BeginUpdateStreamMessage since we... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/client/plugin/pepper_view.cc ('k') | remoting/client/x11_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/x11_view.h
===================================================================
--- remoting/client/x11_view.h (revision 57131)
+++ remoting/client/x11_view.h (working copy)
@@ -8,7 +8,6 @@
#include "base/basictypes.h"
#include "base/scoped_ptr.h"
#include "media/base/video_frame.h"
-#include "remoting/base/decoder.h"
#include "remoting/client/chromoting_view.h"
typedef unsigned long XID;
@@ -19,9 +18,7 @@
// A ChromotingView implemented using X11 and XRender.
class X11View : public ChromotingView {
public:
- X11View(); // Delete this.
- X11View(Display* display, XID window, int width, int height);
-
+ X11View();
virtual ~X11View();
// ChromotingView implementations.
@@ -34,7 +31,7 @@
virtual void SetHostScreenSize(int width, int height);
virtual void HandleBeginUpdateStream(HostMessage* msg);
virtual void HandleUpdateStreamPacket(HostMessage* msg);
- virtual void HandleEndUpdateStream(HostMessage* msg) ;
+ virtual void HandleEndUpdateStream(HostMessage* msg);
Display* display() { return display_; }
@@ -45,19 +42,11 @@
Display* display_;
XID window_;
- int width_;
- int height_;
// A picture created in the X server that represents drawing area of the
// window.
XID picture_;
- scoped_refptr<media::VideoFrame> frame_;
- UpdatedRects update_rects_;
- UpdatedRects all_update_rects_;
-
- scoped_ptr<Decoder> decoder_;
-
DISALLOW_COPY_AND_ASSIGN(X11View);
};
« no previous file with comments | « remoting/client/plugin/pepper_view.cc ('k') | remoting/client/x11_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698