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 /ui/base/models | |
| 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 'ui/base/models')
| -rw-r--r-- | ui/base/models/accelerator_cocoa.h | 2 | ||||
| -rw-r--r-- | ui/base/models/menu_model.h | 2 | ||||
| -rw-r--r-- | ui/base/models/tree_node_model.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ui/base/models/accelerator_cocoa.h b/ui/base/models/accelerator_cocoa.h index 7c8cc03..ef44a5d 100644 --- a/ui/base/models/accelerator_cocoa.h +++ b/ui/base/models/accelerator_cocoa.h @@ -8,7 +8,7 @@ #include <Foundation/Foundation.h> -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "ui/base/models/accelerator.h" namespace ui { diff --git a/ui/base/models/menu_model.h b/ui/base/models/menu_model.h index 9734162..daca3da 100644 --- a/ui/base/models/menu_model.h +++ b/ui/base/models/menu_model.h @@ -6,7 +6,7 @@ #define UI_BASE_MODELS_MENU_MODEL_H_ #pragma once -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/string16.h" #include "ui/base/models/menu_model_delegate.h" #include "ui/gfx/native_widget_types.h" diff --git a/ui/base/models/tree_node_model.h b/ui/base/models/tree_node_model.h index ec6e2c3..e3cfc2f 100644 --- a/ui/base/models/tree_node_model.h +++ b/ui/base/models/tree_node_model.h @@ -12,9 +12,9 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/memory/scoped_ptr.h" +#include "base/memory/scoped_vector.h" #include "base/observer_list.h" -#include "base/scoped_ptr.h" -#include "base/scoped_vector.h" #include "base/string16.h" #include "ui/base/models/tree_model.h" |