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

Side by Side Diff: remoting/protocol/video_reader.cc

Issue 16964002: Rewrite scoped_ptr<T>(NULL) to use the default ctor in remoting/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "remoting/protocol/video_reader.h" 5 #include "remoting/protocol/video_reader.h"
6 6
7 #include "remoting/protocol/session_config.h" 7 #include "remoting/protocol/session_config.h"
8 #include "remoting/protocol/protobuf_video_reader.h" 8 #include "remoting/protocol/protobuf_video_reader.h"
9 9
10 namespace remoting { 10 namespace remoting {
(...skipping 10 matching lines...) Expand all
21 new ProtobufVideoReader(VideoPacketFormat::ENCODING_VP8)); 21 new ProtobufVideoReader(VideoPacketFormat::ENCODING_VP8));
22 } else if (video_config.codec == ChannelConfig::CODEC_ZIP) { 22 } else if (video_config.codec == ChannelConfig::CODEC_ZIP) {
23 return scoped_ptr<VideoReader>( 23 return scoped_ptr<VideoReader>(
24 new ProtobufVideoReader(VideoPacketFormat::ENCODING_ZLIB)); 24 new ProtobufVideoReader(VideoPacketFormat::ENCODING_ZLIB));
25 } else if (video_config.codec == ChannelConfig::CODEC_VERBATIM) { 25 } else if (video_config.codec == ChannelConfig::CODEC_VERBATIM) {
26 return scoped_ptr<VideoReader>( 26 return scoped_ptr<VideoReader>(
27 new ProtobufVideoReader(VideoPacketFormat::ENCODING_VERBATIM)); 27 new ProtobufVideoReader(VideoPacketFormat::ENCODING_VERBATIM));
28 } 28 }
29 } 29 }
30 NOTREACHED(); 30 NOTREACHED();
31 return scoped_ptr<VideoReader>(NULL); 31 return scoped_ptr<VideoReader>();
32 } 32 }
33 33
34 } // namespace protocol 34 } // namespace protocol
35 } // namespace remoting 35 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698