diff options
author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-16 07:26:59 +0000 |
---|---|---|
committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-16 07:26:59 +0000 |
commit | 71f40a766274aec0a473b4a757d85abf42ad6718 (patch) | |
tree | db12c877f109d4c61c8fc4fc1a338ec4cf97fc89 /remoting | |
parent | 5f5f84c60b6883dc5b3c7eaeba6c66c0ac63daca (diff) | |
download | chromium_src-71f40a766274aec0a473b4a757d85abf42ad6718.zip chromium_src-71f40a766274aec0a473b4a757d85abf42ad6718.tar.gz chromium_src-71f40a766274aec0a473b4a757d85abf42ad6718.tar.bz2 |
Cleanup: Remove unneeded scoped_ptr.h includes from ppapi, printing, remoting, and sync.
BUG=none
TEST=none
TBR=brettw,hclam,akalin,abodenha
Review URL: https://chromiumcodereview.appspot.com/10387107
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137376 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r-- | remoting/base/decoder.h | 1 | ||||
-rw-r--r-- | remoting/base/decoder_row_based.h | 2 | ||||
-rw-r--r-- | remoting/base/decoder_vp8.h | 1 | ||||
-rw-r--r-- | remoting/base/decompressor_verbatim.h | 4 | ||||
-rw-r--r-- | remoting/client/plugin/pepper_view.h | 4 | ||||
-rw-r--r-- | remoting/host/x_server_pixel_buffer.h | 3 | ||||
-rw-r--r-- | remoting/protocol/authentication_method.h | 4 | ||||
-rw-r--r-- | remoting/protocol/message_decoder.h | 9 | ||||
-rw-r--r-- | remoting/protocol/rtp_reader.h | 3 |
9 files changed, 13 insertions, 18 deletions
diff --git a/remoting/base/decoder.h b/remoting/base/decoder.h index c4cb7fb..9286ab5 100644 --- a/remoting/base/decoder.h +++ b/remoting/base/decoder.h @@ -6,7 +6,6 @@ #define REMOTING_BASE_DECODER_H_ #include "base/basictypes.h" -#include "base/memory/scoped_ptr.h" #include "remoting/proto/video.pb.h" #include "third_party/skia/include/core/SkRect.h" #include "third_party/skia/include/core/SkRegion.h" diff --git a/remoting/base/decoder_row_based.h b/remoting/base/decoder_row_based.h index a88daa0..fc76837 100644 --- a/remoting/base/decoder_row_based.h +++ b/remoting/base/decoder_row_based.h @@ -5,6 +5,8 @@ #ifndef REMOTING_BASE_DECODER_ROW_BASED_H_ #define REMOTING_BASE_DECODER_ROW_BASED_H_ +#include "base/compiler_specific.h" +#include "base/memory/scoped_ptr.h" #include "remoting/base/decoder.h" namespace remoting { diff --git a/remoting/base/decoder_vp8.h b/remoting/base/decoder_vp8.h index c316ba8..53029e2 100644 --- a/remoting/base/decoder_vp8.h +++ b/remoting/base/decoder_vp8.h @@ -5,6 +5,7 @@ #ifndef REMOTING_BASE_DECODER_VP8_H_ #define REMOTING_BASE_DECODER_VP8_H_ +#include "base/compiler_specific.h" #include "remoting/base/decoder.h" typedef struct vpx_codec_ctx vpx_codec_ctx_t; diff --git a/remoting/base/decompressor_verbatim.h b/remoting/base/decompressor_verbatim.h index cad9022..7cc8885 100644 --- a/remoting/base/decompressor_verbatim.h +++ b/remoting/base/decompressor_verbatim.h @@ -1,11 +1,11 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #ifndef REMOTING_BASE_DECOMPRESSOR_VERBATIM_H_ #define REMOTING_BASE_DECOMPRESSOR_VERBATIM_H_ -#include "base/memory/scoped_ptr.h" +#include "base/compiler_specific.h" #include "remoting/base/decompressor.h" namespace remoting { diff --git a/remoting/client/plugin/pepper_view.h b/remoting/client/plugin/pepper_view.h index 30f0df0..03e02b1 100644 --- a/remoting/client/plugin/pepper_view.h +++ b/remoting/client/plugin/pepper_view.h @@ -10,7 +10,6 @@ #include <list> -#include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "ppapi/cpp/graphics_2d.h" #include "ppapi/cpp/point.h" @@ -25,8 +24,7 @@ class FrameProducer; class PepperView : public ChromotingView, public FrameConsumer, - public base::SupportsWeakPtr<PepperView> -{ + public base::SupportsWeakPtr<PepperView> { public: // Constructs a PepperView for the |instance|. The |instance|, |context| // and |producer| must outlive this class. diff --git a/remoting/host/x_server_pixel_buffer.h b/remoting/host/x_server_pixel_buffer.h index 161beab..fb4180d 100644 --- a/remoting/host/x_server_pixel_buffer.h +++ b/remoting/host/x_server_pixel_buffer.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,6 @@ #define REMOTING_HOST_X_SERVER_PIXEL_BUFFER_H_ #include "base/basictypes.h" -#include "base/memory/scoped_ptr.h" #include "third_party/skia/include/core/SkRect.h" #include <X11/Xutil.h> diff --git a/remoting/protocol/authentication_method.h b/remoting/protocol/authentication_method.h index a4f003e..6b171c4 100644 --- a/remoting/protocol/authentication_method.h +++ b/remoting/protocol/authentication_method.h @@ -15,8 +15,6 @@ #include <string> -#include "base/memory/scoped_ptr.h" - namespace remoting { namespace protocol { @@ -63,7 +61,7 @@ class AuthenticationMethod { private: AuthenticationMethod(); - AuthenticationMethod(HashFunction hash_function); + explicit AuthenticationMethod(HashFunction hash_function); bool invalid_; HashFunction hash_function_; diff --git a/remoting/protocol/message_decoder.h b/remoting/protocol/message_decoder.h index d1ecdcb..8384141 100644 --- a/remoting/protocol/message_decoder.h +++ b/remoting/protocol/message_decoder.h @@ -1,15 +1,14 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef REMOTING_PROTOCOL_MESSAGES_DECODER_H_ -#define REMOTING_PROTOCOL_MESSAGES_DECODER_H_ +#ifndef REMOTING_PROTOCOL_MESSAGE_DECODER_H_ +#define REMOTING_PROTOCOL_MESSAGE_DECODER_H_ #include <deque> #include <list> #include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" #include "net/base/io_buffer.h" #include "remoting/base/compound_buffer.h" #include "third_party/protobuf/src/google/protobuf/message_lite.h" @@ -59,4 +58,4 @@ class MessageDecoder { } // namespace protocol } // namespace remoting -#endif // REMOTING_PROTOCOL_MESSAGES_DECODER_H_ +#endif // REMOTING_PROTOCOL_MESSAGE_DECODER_H_ diff --git a/remoting/protocol/rtp_reader.h b/remoting/protocol/rtp_reader.h index dfd87de..ddaefee 100644 --- a/remoting/protocol/rtp_reader.h +++ b/remoting/protocol/rtp_reader.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,6 @@ #define REMOTING_PROTOCOL_RTP_READER_H_ #include "base/callback.h" -#include "base/memory/scoped_ptr.h" #include "remoting/base/compound_buffer.h" #include "remoting/protocol/rtp_utils.h" #include "remoting/protocol/socket_reader_base.h" |