diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-08 20:19:44 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-08 20:19:44 +0000 |
| commit | f51ffcf1fa06f12c96cc3bcb6c0659c65371fe81 (patch) | |
| tree | 73cf0fc1db209096852914e7ea719d217cf0ad08 /remoting/client/chromoting_client.cc | |
| parent | 482a2662398a751f1a231b1ef84f19de91ee3764 (diff) | |
| download | chromium_src-f51ffcf1fa06f12c96cc3bcb6c0659c65371fe81.zip chromium_src-f51ffcf1fa06f12c96cc3bcb6c0659c65371fe81.tar.gz chromium_src-f51ffcf1fa06f12c96cc3bcb6c0659c65371fe81.tar.bz2 | |
Revert r51857 "Integrating back into using the external ppapi/cpp wrappers."
For some reason, this looks like it breaks all PPAPI ui tests on linux.
TBR: tonyg
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51885 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client/chromoting_client.cc')
| -rw-r--r-- | remoting/client/chromoting_client.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/remoting/client/chromoting_client.cc b/remoting/client/chromoting_client.cc index 39f18b4..cad1993 100644 --- a/remoting/client/chromoting_client.cc +++ b/remoting/client/chromoting_client.cc @@ -8,9 +8,9 @@ #include "remoting/client/chromoting_view.h" #include "remoting/client/host_connection.h" -static const uint32 kCreatedColor = 0xffccccff; -static const uint32 kDisconnectedColor = 0xff00ccff; -static const uint32 kFailedColor = 0xffcc00ff; +static const uint32 kCreatedColor = 0xff0000ff; +static const uint32 kDisconnectedColor = 0xff00ff00; +static const uint32 kFailedColor = 0xffff0000; namespace remoting { @@ -162,9 +162,9 @@ void ChromotingClient::DoHandleUpdate(HostMessage* msg) { void ChromotingClient::DoEndUpdate(HostMessage* msg) { DCHECK_EQ(message_loop(), MessageLoop::current()); - DCHECK(msg->has_end_update_stream()); + DCHECK(msg->has_update_stream_packet()); - view_->HandleEndUpdateStream(msg); + view_->HandleUpdateStreamPacket(msg); } } // namespace remoting |