Index: remoting/client/rectangle_update_decoder.cc |
diff --git a/remoting/client/rectangle_update_decoder.cc b/remoting/client/rectangle_update_decoder.cc |
index 5659fc5baa31c2a3581ec1ba0fc6fc7b027816dd..518e958079901f85d08d05dbc18e7f178591c4a5 100644 |
--- a/remoting/client/rectangle_update_decoder.cc |
+++ b/remoting/client/rectangle_update_decoder.cc |
@@ -6,7 +6,6 @@ |
#include "base/logging.h" |
#include "base/message_loop.h" |
-#include "media/base/callback.h" |
#include "remoting/base/decoder.h" |
#include "remoting/base/decoder_row_based.h" |
#include "remoting/base/decoder_vp8.h" |
@@ -15,9 +14,8 @@ |
#include "remoting/client/frame_consumer.h" |
#include "remoting/protocol/session_config.h" |
-using media::AutoTaskRunner; |
-using remoting::protocol::ChannelConfig; |
-using remoting::protocol::SessionConfig; |
+using ::remoting::protocol::ChannelConfig; |
brettw
2011/05/26 17:17:22
Are the leading colons here necessary? Usually we
Wez
2011/05/26 18:48:21
Reverted.
The C++ Style Guide implied it was pref
|
+using ::remoting::protocol::SessionConfig; |
namespace remoting { |
@@ -84,7 +82,7 @@ void RectangleUpdateDecoder::DecodePacket(const VideoPacket* packet, |
done)); |
return; |
} |
- AutoTaskRunner done_runner(done); |
+ ScopedTaskRunner done_runner(done); |
TraceContext::tracer()->PrintString("Decode Packet called."); |
@@ -100,7 +98,7 @@ void RectangleUpdateDecoder::AllocateFrame(const VideoPacket* packet, |
&RectangleUpdateDecoder::AllocateFrame, packet, done)); |
return; |
} |
- AutoTaskRunner done_runner(done); |
+ ScopedTaskRunner done_runner(done); |
TraceContext::tracer()->PrintString("AllocateFrame called."); |
@@ -150,7 +148,7 @@ void RectangleUpdateDecoder::ProcessPacketData( |
done)); |
return; |
} |
- AutoTaskRunner done_runner(done); |
+ ScopedTaskRunner done_runner(done); |
if (frame_is_new_) { |
decoder_->Reset(); |