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 --- skia/ext/bitmap_platform_device_linux.h | 2 +- skia/ext/bitmap_platform_device_mac.cc | 4 ++-- skia/ext/bitmap_platform_device_mac_unittest.cc | 4 ++-- skia/ext/skia_utils_mac.mm | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'skia/ext') diff --git a/skia/ext/bitmap_platform_device_linux.h b/skia/ext/bitmap_platform_device_linux.h index b4011ac..090a13d 100644 --- a/skia/ext/bitmap_platform_device_linux.h +++ b/skia/ext/bitmap_platform_device_linux.h @@ -6,7 +6,7 @@ #define SKIA_EXT_BITMAP_PLATFORM_DEVICE_LINUX_H_ #pragma once -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "skia/ext/platform_device_linux.h" typedef struct _cairo_surface cairo_surface_t; diff --git a/skia/ext/bitmap_platform_device_mac.cc b/skia/ext/bitmap_platform_device_mac.cc index 75f2f71..9a1dd5a 100644 --- a/skia/ext/bitmap_platform_device_mac.cc +++ b/skia/ext/bitmap_platform_device_mac.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 #include "base/mac/mac_util.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "skia/ext/bitmap_platform_device_data.h" #include "skia/ext/skia_utils_mac.h" #include "third_party/skia/include/core/SkMatrix.h" diff --git a/skia/ext/bitmap_platform_device_mac_unittest.cc b/skia/ext/bitmap_platform_device_mac_unittest.cc index dfd1360..7265bc4 100644 --- a/skia/ext/bitmap_platform_device_mac_unittest.cc +++ b/skia/ext/bitmap_platform_device_mac_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 "skia/ext/bitmap_platform_device_mac.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "skia/ext/skia_utils_mac.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkMatrix.h" diff --git a/skia/ext/skia_utils_mac.mm b/skia/ext/skia_utils_mac.mm index 171d329..c78121a 100644 --- a/skia/ext/skia_utils_mac.mm +++ b/skia/ext/skia_utils_mac.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 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 "base/logging.h" #include "base/mac/scoped_cftyperef.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "skia/ext/bitmap_platform_device_mac.h" #include "third_party/skia/include/utils/mac/SkCGUtils.h" -- cgit v1.1