From 3b63f8f451afcf414a59c529f627c620e4d449d9 Mon Sep 17 00:00:00 2001 From: "levin@chromium.org" Date: Mon, 28 Mar 2011 01:54:15 +0000 Subject: Move some files from base to base/memory. raw_scoped_refptr_mismatch_checker.h ref_counted.cc ref_counted.h ref_counted_memory.cc ref_counted_memory.h ref_counted_unittest.cc scoped_callback_factory.h scoped_comptr_win.h scoped_handle.h scoped_native_library.cc scoped_native_library.h scoped_native_library_unittest.cc scoped_nsobject.h scoped_open_process.h scoped_ptr.h scoped_ptr_unittest.cc scoped_temp_dir.cc scoped_temp_dir.h scoped_temp_dir_unittest.cc scoped_vector.h singleton.h singleton_objc.h singleton_unittest.cc linked_ptr.h linked_ptr_unittest.cc weak_ptr.cc weak_ptr.h weak_ptr_unittest.cc BUG=None TEST=Compile Review URL: http://codereview.chromium.org/6714032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79524 0039d316-1c4b-4281-b951-d872f2087c98 --- media/tools/player_x11/gl_video_renderer.h | 4 ++-- media/tools/player_x11/gles_video_renderer.h | 4 ++-- media/tools/player_x11/player_x11.cc | 2 +- media/tools/player_x11/x11_video_renderer.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'media/tools/player_x11') diff --git a/media/tools/player_x11/gl_video_renderer.h b/media/tools/player_x11/gl_video_renderer.h index 90e5217..bfe0a3b 100644 --- a/media/tools/player_x11/gl_video_renderer.h +++ b/media/tools/player_x11/gl_video_renderer.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 MEDIA_TOOLS_PLAYER_X11_GL_VIDEO_RENDERER_H_ #include "app/gfx/gl/gl_bindings.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "media/base/filters.h" #include "media/filters/video_renderer_base.h" diff --git a/media/tools/player_x11/gles_video_renderer.h b/media/tools/player_x11/gles_video_renderer.h index 25c7dbb..1b70d70 100644 --- a/media/tools/player_x11/gles_video_renderer.h +++ b/media/tools/player_x11/gles_video_renderer.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. @@ -13,8 +13,8 @@ #include #include +#include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/scoped_ptr.h" #include "media/base/filters.h" #include "media/base/video_frame.h" #include "media/filters/video_renderer_base.h" diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc index ace2ba6..9624330 100644 --- a/media/tools/player_x11/player_x11.cc +++ b/media/tools/player_x11/player_x11.cc @@ -10,7 +10,7 @@ #include "base/at_exit.h" #include "base/command_line.h" #include "base/file_path.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/threading/platform_thread.h" #include "base/threading/thread.h" #include "media/base/callback.h" diff --git a/media/tools/player_x11/x11_video_renderer.h b/media/tools/player_x11/x11_video_renderer.h index fd5c12e..51e4996 100644 --- a/media/tools/player_x11/x11_video_renderer.h +++ b/media/tools/player_x11/x11_video_renderer.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 -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "media/base/filters.h" #include "media/filters/video_renderer_base.h" -- cgit v1.1