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 /o3d/plugin/npapi_host_control | |
| 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 'o3d/plugin/npapi_host_control')
5 files changed, 5 insertions, 5 deletions
diff --git a/o3d/plugin/npapi_host_control/win/dispatch_proxy.cc b/o3d/plugin/npapi_host_control/win/dispatch_proxy.cc index 64c8c23..dd435d7 100644 --- a/o3d/plugin/npapi_host_control/win/dispatch_proxy.cc +++ b/o3d/plugin/npapi_host_control/win/dispatch_proxy.cc @@ -36,7 +36,7 @@ #include <dispex.h> #include <oaidl.h> -#include <base/scoped_ptr.h> +#include <base/memory/scoped_ptr.h> #include <algorithm> #include <vector> diff --git a/o3d/plugin/npapi_host_control/win/host_control.h b/o3d/plugin/npapi_host_control/win/host_control.h index 9a4fc68..d6a0382 100644 --- a/o3d/plugin/npapi_host_control/win/host_control.h +++ b/o3d/plugin/npapi_host_control/win/host_control.h @@ -49,7 +49,7 @@ #include <dispex.h> #include <vector> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" // Directory not included, as this file is auto-generated from the // type library. diff --git a/o3d/plugin/npapi_host_control/win/np_object_proxy.cc b/o3d/plugin/npapi_host_control/win/np_object_proxy.cc index b70b02b..5183f45 100644 --- a/o3d/plugin/npapi_host_control/win/np_object_proxy.cc +++ b/o3d/plugin/npapi_host_control/win/np_object_proxy.cc @@ -34,7 +34,7 @@ #include <atlstr.h> #include <vector> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "plugin/npapi_host_control/win/np_object_proxy.h" #include "plugin/npapi_host_control/win/np_browser_proxy.h" #include "plugin/npapi_host_control/win/variant_utils.h" diff --git a/o3d/plugin/npapi_host_control/win/np_plugin_proxy.cc b/o3d/plugin/npapi_host_control/win/np_plugin_proxy.cc index 5404c5f..df0c037 100644 --- a/o3d/plugin/npapi_host_control/win/np_plugin_proxy.cc +++ b/o3d/plugin/npapi_host_control/win/np_plugin_proxy.cc @@ -36,7 +36,7 @@ #include <shlwapi.h> #include <algorithm> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "plugin/npapi_host_control/win/module.h" #include "plugin/npapi_host_control/win/np_browser_proxy.h" #include "plugin/npapi_host_control/win/np_object_proxy.h" diff --git a/o3d/plugin/npapi_host_control/win/variant_utils.cc b/o3d/plugin/npapi_host_control/win/variant_utils.cc index cdd9499..1e4fd1f 100644 --- a/o3d/plugin/npapi_host_control/win/variant_utils.cc +++ b/o3d/plugin/npapi_host_control/win/variant_utils.cc @@ -30,8 +30,8 @@ */ +#include "base/memory/scoped_ptr.h" #include "plugin/npapi_host_control/win/variant_utils.h" -#include "base/scoped_ptr.h" #include "plugin/npapi_host_control/win/dispatch_proxy.h" void VariantToNPVariant(NPBrowserProxy* browser_proxy, |