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

Side by Side Diff: remoting/client/x11_view.h

Issue 3161034: Rename (Host|Client)Message to Chromoting(Host|Client)Message. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Fix merge conflicts 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 unified diff | Download patch
« no previous file with comments | « remoting/client/x11_input_handler.cc ('k') | remoting/client/x11_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
(...skipping 11 matching lines...) Expand all
22 virtual ~X11View(); 22 virtual ~X11View();
23 23
24 // ChromotingView implementations. 24 // ChromotingView implementations.
25 virtual bool Initialize(); 25 virtual bool Initialize();
26 virtual void TearDown(); 26 virtual void TearDown();
27 virtual void Paint(); 27 virtual void Paint();
28 virtual void SetSolidFill(uint32 color); 28 virtual void SetSolidFill(uint32 color);
29 virtual void UnsetSolidFill(); 29 virtual void UnsetSolidFill();
30 virtual void SetViewport(int x, int y, int width, int height); 30 virtual void SetViewport(int x, int y, int width, int height);
31 virtual void SetHostScreenSize(int width, int height); 31 virtual void SetHostScreenSize(int width, int height);
32 virtual void HandleBeginUpdateStream(HostMessage* msg); 32 virtual void HandleBeginUpdateStream(ChromotingHostMessage* msg);
33 virtual void HandleUpdateStreamPacket(HostMessage* msg); 33 virtual void HandleUpdateStreamPacket(ChromotingHostMessage* msg);
34 virtual void HandleEndUpdateStream(HostMessage* msg); 34 virtual void HandleEndUpdateStream(ChromotingHostMessage* msg);
35 35
36 Display* display() { return display_; } 36 Display* display() { return display_; }
37 37
38 private: 38 private:
39 void InitPaintTarget(); 39 void InitPaintTarget();
40 void OnPartialDecodeDone(); 40 void OnPartialDecodeDone();
41 void OnDecodeDone(); 41 void OnDecodeDone();
42 42
43 Display* display_; 43 Display* display_;
44 XID window_; 44 XID window_;
45 45
46 // A picture created in the X server that represents drawing area of the 46 // A picture created in the X server that represents drawing area of the
47 // window. 47 // window.
48 XID picture_; 48 XID picture_;
49 49
50 DISALLOW_COPY_AND_ASSIGN(X11View); 50 DISALLOW_COPY_AND_ASSIGN(X11View);
51 }; 51 };
52 52
53 } // namespace remoting 53 } // namespace remoting
54 54
55 DISABLE_RUNNABLE_METHOD_REFCOUNT(remoting::X11View); 55 DISABLE_RUNNABLE_METHOD_REFCOUNT(remoting::X11View);
56 56
57 #endif // REMOTING_CLIENT_X11_VIEW_H_ 57 #endif // REMOTING_CLIENT_X11_VIEW_H_
OLDNEW
« no previous file with comments | « remoting/client/x11_input_handler.cc ('k') | remoting/client/x11_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698