diff options
| author | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-28 01:54:15 +0000 |
|---|---|---|
| committer | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-28 01:54:15 +0000 |
| commit | 3b63f8f451afcf414a59c529f627c620e4d449d9 (patch) | |
| tree | 2dcbab1c060b29a260c29bb19b67bf97a8293ca3 /base/win | |
| parent | 9174a108509c2aafe513da68e6e63fbc7df38c85 (diff) | |
| download | chromium_src-3b63f8f451afcf414a59c529f627c620e4d449d9.zip chromium_src-3b63f8f451afcf414a59c529f627c620e4d449d9.tar.gz chromium_src-3b63f8f451afcf414a59c529f627c620e4d449d9.tar.bz2 | |
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
Diffstat (limited to 'base/win')
| -rw-r--r-- | base/win/scoped_comptr.h | 4 | ||||
| -rw-r--r-- | base/win/scoped_comptr_unittest.cc | 6 | ||||
| -rw-r--r-- | base/win/win_util.cc | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/base/win/scoped_comptr.h b/base/win/scoped_comptr.h index e508ef2..9a4dd9d 100644 --- a/base/win/scoped_comptr.h +++ b/base/win/scoped_comptr.h @@ -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. @@ -9,7 +9,7 @@ #include <unknwn.h> #include "base/logging.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" namespace base { namespace win { diff --git a/base/win/scoped_comptr_unittest.cc b/base/win/scoped_comptr_unittest.cc index fcd0791..54dcfc0 100644 --- a/base/win/scoped_comptr_unittest.cc +++ b/base/win/scoped_comptr_unittest.cc @@ -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. @@ -6,7 +6,7 @@ #include <shlobj.h> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "testing/gtest/include/gtest/gtest.h" namespace base { @@ -110,4 +110,4 @@ TEST(ScopedComPtrTest, ScopedComPtrVector) { } } // namespace win -} // namespace base
\ No newline at end of file +} // namespace base diff --git a/base/win/win_util.cc b/base/win/win_util.cc index 76d8c5d..8a9d622 100644 --- a/base/win/win_util.cc +++ b/base/win/win_util.cc @@ -12,8 +12,8 @@ #include <shlobj.h> #include "base/logging.h" +#include "base/memory/scoped_ptr.h" #include "base/win/registry.h" -#include "base/scoped_ptr.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/threading/thread_restrictions.h" |