diff options
Diffstat (limited to 'ui/gfx')
26 files changed, 38 insertions, 38 deletions
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; |