diff options
Diffstat (limited to 'ui')
66 files changed, 83 insertions, 83 deletions
diff --git a/ui/base/animation/animation.h b/ui/base/animation/animation.h index bb4be5a..272f093 100644 --- a/ui/base/animation/animation.h +++ b/ui/base/animation/animation.h @@ -6,7 +6,7 @@ #define UI_BASE_ANIMATION_ANIMATION_H_ #pragma once -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/time.h" #include "ui/base/animation/animation_container_element.h" diff --git a/ui/base/animation/animation_container.h b/ui/base/animation/animation_container.h index 337b421..3e7a458 100644 --- a/ui/base/animation/animation_container.h +++ b/ui/base/animation/animation_container.h @@ -8,7 +8,7 @@ #include <set> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/time.h" #include "base/timer.h" diff --git a/ui/base/animation/animation_container_unittest.cc b/ui/base/animation/animation_container_unittest.cc index 6345591..55b53e5 100644 --- a/ui/base/animation/animation_container_unittest.cc +++ b/ui/base/animation/animation_container_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/animation/animation_container.h" diff --git a/ui/base/animation/slide_animation_unittest.cc b/ui/base/animation/slide_animation_unittest.cc index dcce5c0..35227ac 100644 --- a/ui/base/animation/slide_animation_unittest.cc +++ b/ui/base/animation/slide_animation_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/animation/test_animation_delegate.h" diff --git a/ui/base/clipboard/clipboard.cc b/ui/base/clipboard/clipboard.cc index cfd14f8..f16bb92 100644 --- a/ui/base/clipboard/clipboard.cc +++ b/ui/base/clipboard/clipboard.cc @@ -5,7 +5,7 @@ #include "ui/base/clipboard/clipboard.h" #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "ui/gfx/size.h" namespace ui { diff --git a/ui/base/clipboard/clipboard_linux.cc b/ui/base/clipboard/clipboard_linux.cc index 07ea6b7..b37b676 100644 --- a/ui/base/clipboard/clipboard_linux.cc +++ b/ui/base/clipboard/clipboard_linux.cc @@ -12,7 +12,7 @@ #include "base/file_path.h" #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/utf_string_conversions.h" #include "ui/gfx/gtk_util.h" #include "ui/gfx/size.h" diff --git a/ui/base/clipboard/clipboard_mac.mm b/ui/base/clipboard/clipboard_mac.mm index be1908b..e9dff9b 100644 --- a/ui/base/clipboard/clipboard_mac.mm +++ b/ui/base/clipboard/clipboard_mac.mm @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #import "third_party/mozilla/NSPasteboard+Utils.h" diff --git a/ui/base/clipboard/clipboard_unittest.cc b/ui/base/clipboard/clipboard_unittest.cc index e8c6983..a486ed1 100644 --- a/ui/base/clipboard/clipboard_unittest.cc +++ b/ui/base/clipboard/clipboard_unittest.cc @@ -7,7 +7,7 @@ #include <string> #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/ui/base/clipboard/clipboard_util_win.cc b/ui/base/clipboard/clipboard_util_win.cc index c6dd6a3..43b1d5f 100644 --- a/ui/base/clipboard/clipboard_util_win.cc +++ b/ui/base/clipboard/clipboard_util_win.cc @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/logging.h" -#include "base/scoped_handle.h" +#include "base/memory/scoped_handle.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/win/scoped_hglobal.h" diff --git a/ui/base/dragdrop/download_file_interface.h b/ui/base/dragdrop/download_file_interface.h index 1054370..ab09afd 100644 --- a/ui/base/dragdrop/download_file_interface.h +++ b/ui/base/dragdrop/download_file_interface.h @@ -9,7 +9,7 @@ #include "build/build_config.h" #include "base/basictypes.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #if defined(OS_WIN) #include <objidl.h> diff --git a/ui/base/dragdrop/drag_source.h b/ui/base/dragdrop/drag_source.h index 1ae1656..ab67434 100644 --- a/ui/base/dragdrop/drag_source.h +++ b/ui/base/dragdrop/drag_source.h @@ -9,7 +9,7 @@ #include <objidl.h> #include "base/basictypes.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" namespace ui { diff --git a/ui/base/dragdrop/drop_target.h b/ui/base/dragdrop/drop_target.h index 0baed43..9b8903a 100644 --- a/ui/base/dragdrop/drop_target.h +++ b/ui/base/dragdrop/drop_target.h @@ -8,7 +8,7 @@ #include <objidl.h> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" // Windows interface. struct IDropTargetHelper; diff --git a/ui/base/dragdrop/gtk_dnd_util_unittest.cc b/ui/base/dragdrop/gtk_dnd_util_unittest.cc index 33e5a6b..513661d 100644 --- a/ui/base/dragdrop/gtk_dnd_util_unittest.cc +++ b/ui/base/dragdrop/gtk_dnd_util_unittest.cc @@ -4,8 +4,8 @@ #include <string> +#include "base/memory/scoped_ptr.h" #include "base/pickle.h" -#include "base/scoped_ptr.h" #include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/ui/base/dragdrop/os_exchange_data.h b/ui/base/dragdrop/os_exchange_data.h index 3ef254a..05bb881 100644 --- a/ui/base/dragdrop/os_exchange_data.h +++ b/ui/base/dragdrop/os_exchange_data.h @@ -19,7 +19,7 @@ #include "base/basictypes.h" #include "base/file_path.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "ui/base/dragdrop/download_file_interface.h" class GURL; diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.cc b/ui/base/dragdrop/os_exchange_data_provider_win.cc index 5e2ea1b..6712d7d 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_win.cc +++ b/ui/base/dragdrop/os_exchange_data_provider_win.cc @@ -7,8 +7,8 @@ #include "base/file_path.h" #include "base/i18n/file_util_icu.h" #include "base/logging.h" +#include "base/memory/scoped_handle.h" #include "base/pickle.h" -#include "base/scoped_handle.h" #include "base/stl_util-inl.h" #include "base/utf_string_conversions.h" #include "base/win/scoped_hglobal.h" diff --git a/ui/base/dragdrop/os_exchange_data_win_unittest.cc b/ui/base/dragdrop/os_exchange_data_win_unittest.cc index 8f65716..def16a7 100644 --- a/ui/base/dragdrop/os_exchange_data_win_unittest.cc +++ b/ui/base/dragdrop/os_exchange_data_win_unittest.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_handle.h" +#include "base/memory/scoped_ptr.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/dragdrop/os_exchange_data_provider_win.h" #include "base/pickle.h" -#include "base/ref_counted.h" -#include "base/scoped_handle.h" -#include "base/scoped_ptr.h" #include "base/utf_string_conversions.h" #include "base/win/scoped_hglobal.h" #include "googleurl/src/gurl.h" diff --git a/ui/base/l10n/l10n_util.cc b/ui/base/l10n/l10n_util.cc index 7171340..b244e8f 100644 --- a/ui/base/l10n/l10n_util.cc +++ b/ui/base/l10n/l10n_util.cc @@ -16,8 +16,8 @@ #include "base/file_util.h" #include "base/i18n/file_util_icu.h" #include "base/i18n/rtl.h" +#include "base/memory/scoped_ptr.h" #include "base/path_service.h" -#include "base/scoped_ptr.h" #include "base/string16.h" #include "base/string_number_conversions.h" #include "base/string_split.h" diff --git a/ui/base/l10n/l10n_util.h b/ui/base/l10n/l10n_util.h index e0c6150..90f5674 100644 --- a/ui/base/l10n/l10n_util.h +++ b/ui/base/l10n/l10n_util.h @@ -17,7 +17,7 @@ #include "build/build_config.h" #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/string16.h" #include "base/string_util.h" diff --git a/ui/base/l10n/l10n_util_collator.h b/ui/base/l10n/l10n_util_collator.h index eea2764..8610ca2 100644 --- a/ui/base/l10n/l10n_util_collator.h +++ b/ui/base/l10n/l10n_util_collator.h @@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/utf_string_conversions.h" #include "unicode/coll.h" 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" diff --git a/ui/base/resource/data_pack.cc b/ui/base/resource/data_pack.cc index f1cedcc..46fd4a0 100644 --- a/ui/base/resource/data_pack.cc +++ b/ui/base/resource/data_pack.cc @@ -8,8 +8,8 @@ #include "base/file_util.h" #include "base/logging.h" +#include "base/memory/ref_counted_memory.h" #include "base/metrics/histogram.h" -#include "base/ref_counted_memory.h" #include "base/string_piece.h" // For details of the file layout, see diff --git a/ui/base/resource/data_pack.h b/ui/base/resource/data_pack.h index 2f890c6..fb5f79b 100644 --- a/ui/base/resource/data_pack.h +++ b/ui/base/resource/data_pack.h @@ -13,7 +13,7 @@ #include <map> #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" class FilePath; class RefCountedStaticMemory; diff --git a/ui/base/resource/data_pack_unittest.cc b/ui/base/resource/data_pack_unittest.cc index 9205fdf..a2b767b 100644 --- a/ui/base/resource/data_pack_unittest.cc +++ b/ui/base/resource/data_pack_unittest.cc @@ -4,8 +4,8 @@ #include "base/file_path.h" #include "base/file_util.h" +#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" -#include "base/scoped_temp_dir.h" #include "base/string_piece.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/resource/data_pack.h" diff --git a/ui/base/resource/resource_bundle.h b/ui/base/resource/resource_bundle.h index dd5a65f..c77f01f 100644 --- a/ui/base/resource/resource_bundle.h +++ b/ui/base/resource/resource_bundle.h @@ -18,8 +18,8 @@ #include "base/basictypes.h" #include "base/file_path.h" -#include "base/ref_counted_memory.h" -#include "base/scoped_ptr.h" +#include "base/memory/ref_counted_memory.h" +#include "base/memory/scoped_ptr.h" #include "base/string16.h" #include "ui/gfx/native_widget_types.h" diff --git a/ui/base/resource/resource_bundle_mac.mm b/ui/base/resource/resource_bundle_mac.mm index c359a85..1a238a7 100644 --- a/ui/base/resource/resource_bundle_mac.mm +++ b/ui/base/resource/resource_bundle_mac.mm @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/file_path.h" #include "base/mac/mac_util.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "base/synchronization/lock.h" #include "base/sys_string_conversions.h" #include "ui/gfx/image.h" diff --git a/ui/base/text/text_elider_unittest.cc b/ui/base/text/text_elider_unittest.cc index 3545656..083d9f2 100644 --- a/ui/base/text/text_elider_unittest.cc +++ b/ui/base/text/text_elider_unittest.cc @@ -4,7 +4,7 @@ #include "base/file_path.h" #include "base/i18n/rtl.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" diff --git a/ui/base/view_prop.h b/ui/base/view_prop.h index 23c5060..ae185e4 100644 --- a/ui/base/view_prop.h +++ b/ui/base/view_prop.h @@ -7,7 +7,7 @@ #pragma once #include "base/basictypes.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "ui/gfx/native_widget_types.h" namespace ui { diff --git a/ui/base/view_prop_unittest.cc b/ui/base/view_prop_unittest.cc index 686099f..5ac45df 100644 --- a/ui/base/view_prop_unittest.cc +++ b/ui/base/view_prop_unittest.cc @@ -4,7 +4,7 @@ #include "testing/gtest/include/gtest/gtest.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "ui/base/view_prop.h" namespace ui { diff --git a/ui/base/win/ime_input.cc b/ui/base/win/ime_input.cc index a520f03..ff87d45 100644 --- a/ui/base/win/ime_input.cc +++ b/ui/base/win/ime_input.cc @@ -5,7 +5,7 @@ #include "ui/base/win/ime_input.h" #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/string16.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" diff --git a/ui/base/win/window_impl.cc b/ui/base/win/window_impl.cc index 2f6da99..4cd54bd 100644 --- a/ui/base/win/window_impl.cc +++ b/ui/base/win/window_impl.cc @@ -6,7 +6,7 @@ #include <list> -#include "base/singleton.h" +#include "base/memory/singleton.h" #include "base/string_number_conversions.h" #include "base/win/wrapped_window_proc.h" #include "ui/base/win/hwnd_util.h" diff --git a/ui/base/x/active_window_watcher_x.h b/ui/base/x/active_window_watcher_x.h index 68907c4..94a7775d 100644 --- a/ui/base/x/active_window_watcher_x.h +++ b/ui/base/x/active_window_watcher_x.h @@ -9,8 +9,8 @@ #include <gdk/gdk.h> #include "base/basictypes.h" +#include "base/memory/singleton.h" #include "base/observer_list.h" -#include "base/singleton.h" namespace ui { diff --git a/ui/gfx/canvas_direct2d.cc b/ui/gfx/canvas_direct2d.cc index 38ed18aa..6c4d3bb 100644 --- a/ui/gfx/canvas_direct2d.cc +++ b/ui/gfx/canvas_direct2d.cc @@ -4,7 +4,7 @@ #include "ui/gfx/canvas_direct2d.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "ui/gfx/brush.h" #include "ui/gfx/rect.h" diff --git a/ui/gfx/canvas_direct2d_unittest.cc b/ui/gfx/canvas_direct2d_unittest.cc index fd18c7c..3f645b1 100644 --- a/ui/gfx/canvas_direct2d_unittest.cc +++ b/ui/gfx/canvas_direct2d_unittest.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. @@ -8,9 +8,9 @@ #include <vssym32.h> #include "base/command_line.h" -#include "base/ref_counted_memory.h" +#include "base/memory/ref_counted_memory.h" +#include "base/memory/scoped_ptr.h" #include "base/resource_util.h" -#include "base/scoped_ptr.h" #include "grit/gfx_resources.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/brush.h" diff --git a/ui/gfx/codec/jpeg_codec.cc b/ui/gfx/codec/jpeg_codec.cc index 3c119d8..a58756b 100644 --- a/ui/gfx/codec/jpeg_codec.cc +++ b/ui/gfx/codec/jpeg_codec.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. @@ -7,7 +7,7 @@ #include <setjmp.h> #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColorPriv.h" diff --git a/ui/gfx/codec/png_codec.cc b/ui/gfx/codec/png_codec.cc index a0dfbbe..6cd761f 100644 --- a/ui/gfx/codec/png_codec.cc +++ b/ui/gfx/codec/png_codec.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2009 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 "ui/gfx/codec/png_codec.h" #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkUnPreMultiply.h" #include "third_party/skia/include/core/SkColorPriv.h" diff --git a/ui/gfx/compositor/compositor.h b/ui/gfx/compositor/compositor.h index a7da715..7d19598 100644 --- a/ui/gfx/compositor/compositor.h +++ b/ui/gfx/compositor/compositor.h @@ -6,7 +6,7 @@ #define UI_GFX_COMPOSITOR_COMPOSITOR_H_ #pragma once -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "ui/gfx/native_widget_types.h" namespace ui { diff --git a/ui/gfx/compositor/compositor_gl.cc b/ui/gfx/compositor/compositor_gl.cc index 143821a..6fa426a 100644 --- a/ui/gfx/compositor/compositor_gl.cc +++ b/ui/gfx/compositor/compositor_gl.cc @@ -7,10 +7,10 @@ #include "app/gfx/gl/gl_context.h" #include "app/gfx/gl/gl_bindings.h" #include "app/gfx/gl/gl_implementation.h" -#include "base/scoped_ptr.h" #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/memory/scoped_ptr.h" #include "ui/gfx/transform.h" namespace ui { diff --git a/ui/gfx/font.h b/ui/gfx/font.h index 222aeb8..3d7ce25 100644 --- a/ui/gfx/font.h +++ b/ui/gfx/font.h @@ -8,7 +8,7 @@ #include <string> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/string16.h" #include "ui/gfx/native_widget_types.h" diff --git a/ui/gfx/gtk_native_view_id_manager.h b/ui/gfx/gtk_native_view_id_manager.h index ca38211..462a51d 100644 --- a/ui/gfx/gtk_native_view_id_manager.h +++ b/ui/gfx/gtk_native_view_id_manager.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 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 <map> -#include "base/singleton.h" +#include "base/memory/singleton.h" #include "base/synchronization/lock.h" #include "ui/gfx/native_widget_types.h" diff --git a/ui/gfx/gtk_util.h b/ui/gfx/gtk_util.h index fd3575f..cf7bc04 100644 --- a/ui/gfx/gtk_util.h +++ b/ui/gfx/gtk_util.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 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. @@ -12,7 +12,7 @@ #include <string> #include <vector> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" typedef struct _GdkPixbuf GdkPixbuf; typedef struct _GdkRegion GdkRegion; diff --git a/ui/gfx/icon_util.cc b/ui/gfx/icon_util.cc index 57d8973..fc89794 100644 --- a/ui/gfx/icon_util.cc +++ b/ui/gfx/icon_util.cc @@ -6,7 +6,7 @@ #include "base/file_util.h" #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/win/scoped_handle.h" #include "skia/ext/image_operations.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/ui/gfx/icon_util_unittest.cc b/ui/gfx/icon_util_unittest.cc index b78408f..50c1058 100644 --- a/ui/gfx/icon_util_unittest.cc +++ b/ui/gfx/icon_util_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 "base/file_util.h" +#include "base/memory/scoped_ptr.h" #include "base/path_service.h" -#include "base/scoped_ptr.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/gfx_paths.h" diff --git a/ui/gfx/image_unittest.cc b/ui/gfx/image_unittest.cc index b2fe9db..37bfa98 100644 --- a/ui/gfx/image_unittest.cc +++ b/ui/gfx/image_unittest.cc @@ -4,7 +4,7 @@ #include "ui/gfx/image.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/image_unittest.h" diff --git a/ui/gfx/image_unittest.h b/ui/gfx/image_unittest.h index 47057d6..09abfce 100644 --- a/ui/gfx/image_unittest.h +++ b/ui/gfx/image_unittest.h @@ -8,7 +8,7 @@ #ifndef UI_GFX_IMAGE_UNITTEST_H_ #define UI_GFX_IMAGE_UNITTEST_H_ -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/ui/gfx/native_theme_win.cc b/ui/gfx/native_theme_win.cc index 6fe134b..73f963a 100644 --- a/ui/gfx/native_theme_win.cc +++ b/ui/gfx/native_theme_win.cc @@ -10,7 +10,7 @@ #include <vssym32.h> #include "base/logging.h" -#include "base/scoped_handle.h" +#include "base/memory/scoped_handle.h" #include "base/win/scoped_gdi_object.h" #include "base/win/scoped_hdc.h" #include "base/win/windows_version.h" diff --git a/ui/gfx/path_gtk.cc b/ui/gfx/path_gtk.cc index b21ea9b..bb1c3fc 100644 --- a/ui/gfx/path_gtk.cc +++ b/ui/gfx/path_gtk.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,8 +6,8 @@ #include <gdk/gdk.h> -#include "base/scoped_ptr.h" #include "base/command_line.h" +#include "base/memory/scoped_ptr.h" namespace gfx { diff --git a/ui/gfx/path_win.cc b/ui/gfx/path_win.cc index ef09959..e011f6b 100644 --- a/ui/gfx/path_win.cc +++ b/ui/gfx/path_win.cc @@ -1,10 +1,10 @@ -// 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. #include "ui/gfx/path.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" namespace gfx { diff --git a/ui/gfx/platform_font.h b/ui/gfx/platform_font.h index 7b1874d..5a312d8 100644 --- a/ui/gfx/platform_font.h +++ b/ui/gfx/platform_font.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. @@ -8,7 +8,7 @@ #include <string> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/string16.h" #include "ui/gfx/native_widget_types.h" diff --git a/ui/gfx/platform_font_gtk.h b/ui/gfx/platform_font_gtk.h index 44912b4..7f7a4ec 100644 --- a/ui/gfx/platform_font_gtk.h +++ b/ui/gfx/platform_font_gtk.h @@ -6,7 +6,7 @@ #define UI_GFX_PLATFORM_FONT_GTK_ #pragma once -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "third_party/skia/include/core/SkRefCnt.h" #include "ui/gfx/platform_font.h" diff --git a/ui/gfx/platform_font_mac.mm b/ui/gfx/platform_font_mac.mm index 46f69ef..48bb4c8 100644 --- a/ui/gfx/platform_font_mac.mm +++ b/ui/gfx/platform_font_mac.mm @@ -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 <Cocoa/Cocoa.h> #include "base/basictypes.h" -#include "base/scoped_nsobject.h" +#include "base/memory/scoped_nsobject.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "ui/gfx/canvas_skia.h" diff --git a/ui/gfx/platform_font_win.h b/ui/gfx/platform_font_win.h index a7a25c4..422367e 100644 --- a/ui/gfx/platform_font_win.h +++ b/ui/gfx/platform_font_win.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 UI_GFX_PLATFORM_FONT_WIN_ #pragma once -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "ui/gfx/platform_font.h" namespace gfx { diff --git a/ui/gfx/surface/accelerated_surface_mac.h b/ui/gfx/surface/accelerated_surface_mac.h index 44ce8d5..004f49a 100644 --- a/ui/gfx/surface/accelerated_surface_mac.h +++ b/ui/gfx/surface/accelerated_surface_mac.h @@ -11,7 +11,7 @@ #include "app/gfx/gl/gl_context.h" #include "base/callback.h" #include "base/mac/scoped_cftyperef.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" #include "ui/gfx/surface/transport_dib.h" diff --git a/ui/gfx/surface/io_surface_support_mac.cc b/ui/gfx/surface/io_surface_support_mac.cc index 15e33dc..df08217 100644 --- a/ui/gfx/surface/io_surface_support_mac.cc +++ b/ui/gfx/surface/io_surface_support_mac.cc @@ -4,7 +4,7 @@ #include <dlfcn.h> -#include "base/singleton.h" +#include "base/memory/singleton.h" #include "ui/gfx/surface/io_surface_support_mac.h" typedef CFTypeRef (*IOSurfaceCreateProcPtr)(CFDictionaryRef properties); diff --git a/ui/gfx/surface/transport_dib_linux.cc b/ui/gfx/surface/transport_dib_linux.cc index 3e31c7b..c41ea9e 100644 --- a/ui/gfx/surface/transport_dib_linux.cc +++ b/ui/gfx/surface/transport_dib_linux.cc @@ -10,7 +10,7 @@ #include <sys/shm.h> #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "skia/ext/platform_canvas.h" #include "ui/base/x/x11_util.h" #include "ui/gfx/size.h" diff --git a/ui/gfx/surface/transport_dib_mac.cc b/ui/gfx/surface/transport_dib_mac.cc index 268bce1..23c6f37 100644 --- a/ui/gfx/surface/transport_dib_mac.cc +++ b/ui/gfx/surface/transport_dib_mac.cc @@ -9,7 +9,7 @@ #include "base/eintr_wrapper.h" #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/shared_memory.h" #include "skia/ext/platform_canvas.h" diff --git a/ui/gfx/surface/transport_dib_win.cc b/ui/gfx/surface/transport_dib_win.cc index 977153f..a7df666 100644 --- a/ui/gfx/surface/transport_dib_win.cc +++ b/ui/gfx/surface/transport_dib_win.cc @@ -9,7 +9,7 @@ #include <limits> #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/sys_info.h" #include "skia/ext/platform_canvas.h" diff --git a/ui/gfx/transform_skia.h b/ui/gfx/transform_skia.h index 83f58c5..5ad93f6 100644 --- a/ui/gfx/transform_skia.h +++ b/ui/gfx/transform_skia.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "ui/gfx/transform.h" class SkMatrix; diff --git a/ui/views/focus/focus_manager.h b/ui/views/focus/focus_manager.h index e31b8e6..58f553d 100644 --- a/ui/views/focus/focus_manager.h +++ b/ui/views/focus/focus_manager.h @@ -11,7 +11,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/singleton.h" +#include "base/memory/singleton.h" #include "ui/gfx/native_widget_types.h" #include "ui/views/events/accelerator.h" #include "ui/views/events/focus_event.h" diff --git a/ui/views/view.h b/ui/views/view.h index 8067c32..ffcbbb4 100644 --- a/ui/views/view.h +++ b/ui/views/view.h @@ -8,7 +8,7 @@ #include <vector> #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" diff --git a/ui/views/widget/native_widget_win.cc b/ui/views/widget/native_widget_win.cc index bc89810..ac6cfed 100644 --- a/ui/views/widget/native_widget_win.cc +++ b/ui/views/widget/native_widget_win.cc @@ -4,7 +4,7 @@ #include "ui/views/widget/native_widget_win.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "ui/base/system_monitor/system_monitor.h" #include "ui/base/view_prop.h" #include "ui/base/win/hwnd_util.h" diff --git a/ui/views/widget/native_widget_win.h b/ui/views/widget/native_widget_win.h index c3e724e..1d85405 100644 --- a/ui/views/widget/native_widget_win.h +++ b/ui/views/widget/native_widget_win.h @@ -7,9 +7,9 @@ #include "ui/base/win/window_impl.h" #include "base/logging.h" +#include "base/memory/scoped_ptr.h" +#include "base/memory/scoped_vector.h" #include "base/message_loop.h" -#include "base/scoped_ptr.h" -#include "base/scoped_vector.h" #include "ui/views/widget/native_widget.h" namespace gfx { diff --git a/ui/views/widget/root_view_unittest.cc b/ui/views/widget/root_view_unittest.cc index 392ad58..3c4e603 100644 --- a/ui/views/widget/root_view_unittest.cc +++ b/ui/views/widget/root_view_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h index 3a375bc..532b8506 100644 --- a/ui/views/widget/widget.h +++ b/ui/views/widget/widget.h @@ -6,7 +6,7 @@ #define UI_VIEWS_WIDGET_WIDGET_H_ #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/task.h" #include "ui/gfx/point.h" #include "ui/views/native_types.h" diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc index d158e7d..767aaa2 100644 --- a/ui/views/widget/widget_unittest.cc +++ b/ui/views/widget/widget_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/views/focus/focus_manager.h" #include "ui/views/widget/native_widget.h" |