diff options
Diffstat (limited to 'remoting/host')
27 files changed, 56 insertions, 56 deletions
diff --git a/remoting/host/access_verifier_unittest.cc b/remoting/host/access_verifier_unittest.cc index ae0028b..1e1bebe 100644 --- a/remoting/host/access_verifier_unittest.cc +++ b/remoting/host/access_verifier_unittest.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/task.h" #include "remoting/host/access_verifier.h" #include "remoting/host/in_memory_host_config.h" diff --git a/remoting/host/capturer_fake.h b/remoting/host/capturer_fake.h index 97a7b74e..9eacc21 100644 --- a/remoting/host/capturer_fake.h +++ b/remoting/host/capturer_fake.h @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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_HOST_CAPTURER_FAKE_H_ #define REMOTING_HOST_CAPTURER_FAKE_H_ -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "remoting/host/capturer.h" namespace remoting { diff --git a/remoting/host/capturer_fake_ascii.h b/remoting/host/capturer_fake_ascii.h index e68b8b4..a07fb06 100644 --- a/remoting/host/capturer_fake_ascii.h +++ b/remoting/host/capturer_fake_ascii.h @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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_HOST_CAPTURER_FAKE_ASCII_H_ #define REMOTING_HOST_CAPTURER_FAKE_ASCII_H_ -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "remoting/host/capturer.h" namespace remoting { diff --git a/remoting/host/capturer_gdi.h b/remoting/host/capturer_gdi.h index 634520e..28f964b 100644 --- a/remoting/host/capturer_gdi.h +++ b/remoting/host/capturer_gdi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -7,7 +7,7 @@ #include <windows.h> typedef HBITMAP BitmapRef; -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "remoting/host/capturer.h" namespace remoting { diff --git a/remoting/host/capturer_linux.h b/remoting/host/capturer_linux.h index 8e8fcb3..15aa438 100644 --- a/remoting/host/capturer_linux.h +++ b/remoting/host/capturer_linux.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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,7 @@ #define REMOTING_HOST_CAPTURER_LINUX_H_ #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "remoting/host/capturer.h" namespace remoting { diff --git a/remoting/host/capturer_mac.h b/remoting/host/capturer_mac.h index 7ea8d99..442098d 100644 --- a/remoting/host/capturer_mac.h +++ b/remoting/host/capturer_mac.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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,7 @@ #include "remoting/host/capturer.h" #include <ApplicationServices/ApplicationServices.h> #include <OpenGL/OpenGL.h> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" namespace remoting { diff --git a/remoting/host/capturer_mac_unittest.cc b/remoting/host/capturer_mac_unittest.cc index bfa1786..cf4ef54 100644 --- a/remoting/host/capturer_mac_unittest.cc +++ b/remoting/host/capturer_mac_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -7,7 +7,7 @@ #include <iostream> #include "base/callback.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "remoting/base/types.h" #include "remoting/host/capturer_mac.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/remoting/host/chromoting_host.h b/remoting/host/chromoting_host.h index f754c27..77efd3d 100644 --- a/remoting/host/chromoting_host.h +++ b/remoting/host/chromoting_host.h @@ -7,7 +7,7 @@ #include <string> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/threading/thread.h" #include "remoting/base/encoder.h" #include "remoting/host/access_verifier.h" diff --git a/remoting/host/client_session.cc b/remoting/host/client_session.cc index f346e43..72cd5ba 100644 --- a/remoting/host/client_session.cc +++ b/remoting/host/client_session.cc @@ -4,7 +4,7 @@ #include "remoting/host/client_session.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/task.h" #include "remoting/host/user_authenticator.h" #include "remoting/proto/auth.pb.h" diff --git a/remoting/host/desktop_environment.h b/remoting/host/desktop_environment.h index 7d5846b..5517ea4 100644 --- a/remoting/host/desktop_environment.h +++ b/remoting/host/desktop_environment.h @@ -6,7 +6,7 @@ #define REMOTING_HOST_DESKTOP_ENVIRONMENT_H_ #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" namespace remoting { diff --git a/remoting/host/differ.h b/remoting/host/differ.h index a5af54f..84555ee 100644 --- a/remoting/host/differ.h +++ b/remoting/host/differ.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "remoting/base/types.h" #include "ui/gfx/rect.h" diff --git a/remoting/host/differ_block_unittest.cc b/remoting/host/differ_block_unittest.cc index 6940fd2..ad91a87 100644 --- a/remoting/host/differ_block_unittest.cc +++ b/remoting/host/differ_block_unittest.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "remoting/host/differ_block.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/remoting/host/differ_unittest.cc b/remoting/host/differ_unittest.cc index 1728a73..8d78468 100644 --- a/remoting/host/differ_unittest.cc +++ b/remoting/host/differ_unittest.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "remoting/host/differ.h" #include "remoting/host/differ_block.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/remoting/host/event_executor_linux.h b/remoting/host/event_executor_linux.h index 8b61dd0..64ce94e 100644 --- a/remoting/host/event_executor_linux.h +++ b/remoting/host/event_executor_linux.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -9,7 +9,7 @@ #include "base/task.h" #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "remoting/host/event_executor.h" #include "remoting/protocol/input_stub.h" diff --git a/remoting/host/event_executor_win.h b/remoting/host/event_executor_win.h index 1eebf33..9498319 100644 --- a/remoting/host/event_executor_win.h +++ b/remoting/host/event_executor_win.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -9,7 +9,7 @@ #include "base/task.h" #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "remoting/host/event_executor.h" #include "remoting/protocol/input_stub.h" diff --git a/remoting/host/heartbeat_sender.h b/remoting/host/heartbeat_sender.h index 089e040..1105179 100644 --- a/remoting/host/heartbeat_sender.h +++ b/remoting/host/heartbeat_sender.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -7,8 +7,8 @@ #include <string> -#include "base/scoped_ptr.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "remoting/host/host_key_pair.h" #include "remoting/jingle_glue/iq_request.h" #include "testing/gtest/include/gtest/gtest_prod.h" diff --git a/remoting/host/heartbeat_sender_unittest.cc b/remoting/host/heartbeat_sender_unittest.cc index dded547..e02cc35 100644 --- a/remoting/host/heartbeat_sender_unittest.cc +++ b/remoting/host/heartbeat_sender_unittest.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. +#include "base/memory/ref_counted.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" -#include "base/ref_counted.h" #include "base/string_number_conversions.h" #include "remoting/base/constants.h" #include "remoting/host/heartbeat_sender.h" diff --git a/remoting/host/host_config.h b/remoting/host/host_config.h index bf62b7a..d9c1cd4 100644 --- a/remoting/host/host_config.h +++ b/remoting/host/host_config.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -7,7 +7,7 @@ #include <string> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" class Task; diff --git a/remoting/host/host_key_pair.h b/remoting/host/host_key_pair.h index 2148739..b087e1f 100644 --- a/remoting/host/host_key_pair.h +++ b/remoting/host/host_key_pair.h @@ -7,8 +7,8 @@ #include <string> -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/task.h" namespace base { diff --git a/remoting/host/host_key_pair_unittest.cc b/remoting/host/host_key_pair_unittest.cc index 6aa6d70..9ef1d5e 100644 --- a/remoting/host/host_key_pair_unittest.cc +++ b/remoting/host/host_key_pair_unittest.cc @@ -1,13 +1,13 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. #include <string> +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" -#include "base/ref_counted.h" -#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "remoting/host/host_key_pair.h" #include "remoting/host/json_host_config.h" diff --git a/remoting/host/in_memory_host_config.h b/remoting/host/in_memory_host_config.h index 998580a..e0a876d 100644 --- a/remoting/host/in_memory_host_config.h +++ b/remoting/host/in_memory_host_config.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -7,8 +7,8 @@ #include <string> -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "remoting/host/host_config.h" diff --git a/remoting/host/json_host_config.h b/remoting/host/json_host_config.h index d9f233b..56ec01d 100644 --- a/remoting/host/json_host_config.h +++ b/remoting/host/json_host_config.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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,8 +8,8 @@ #include <string> #include "base/file_path.h" -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "remoting/host/in_memory_host_config.h" class DictionaryValue; diff --git a/remoting/host/json_host_config_unittest.cc b/remoting/host/json_host_config_unittest.cc index 20ea501..9a1893d 100644 --- a/remoting/host/json_host_config_unittest.cc +++ b/remoting/host/json_host_config_unittest.cc @@ -1,13 +1,13 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. #include "base/file_util.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/path_service.h" -#include "base/ref_counted.h" -#include "base/scoped_temp_dir.h" #include "remoting/host/json_host_config.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/remoting/host/keygen_main.cc b/remoting/host/keygen_main.cc index 88f363c..73b1aa2 100644 --- a/remoting/host/keygen_main.cc +++ b/remoting/host/keygen_main.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. // @@ -14,7 +14,7 @@ #include "base/at_exit.h" #include "base/base64.h" #include "base/crypto/rsa_private_key.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" int main(int argc, char** argv) { base::AtExitManager exit_manager; diff --git a/remoting/host/screen_recorder.cc b/remoting/host/screen_recorder.cc index b7d4d8f..543408e 100644 --- a/remoting/host/screen_recorder.cc +++ b/remoting/host/screen_recorder.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -7,7 +7,7 @@ #include <algorithm> #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/stl_util-inl.h" #include "base/task.h" #include "base/time.h" diff --git a/remoting/host/screen_recorder.h b/remoting/host/screen_recorder.h index 2fa0fdc..da2dbf1 100644 --- a/remoting/host/screen_recorder.h +++ b/remoting/host/screen_recorder.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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,9 +8,9 @@ #include <vector> #include "base/basictypes.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" #include "base/timer.h" #include "remoting/base/encoder.h" #include "remoting/host/capturer.h" diff --git a/remoting/host/x_server_pixel_buffer.h b/remoting/host/x_server_pixel_buffer.h index 98bb8f6..e27b9f7 100644 --- a/remoting/host/x_server_pixel_buffer.h +++ b/remoting/host/x_server_pixel_buffer.h @@ -7,8 +7,8 @@ #ifndef REMOTING_HOST_X_SERVER_PIXEL_BUFFER_H_ #define REMOTING_HOST_X_SERVER_PIXEL_BUFFER_H_ -#include "base/scoped_ptr.h" #include "base/basictypes.h" +#include "base/memory/scoped_ptr.h" #include "ui/gfx/rect.h" #include <X11/Xutil.h> |