diff options
Diffstat (limited to 'content/browser/renderer_host')
23 files changed, 32 insertions, 32 deletions
diff --git a/content/browser/renderer_host/accelerated_surface_container_mac.h b/content/browser/renderer_host/accelerated_surface_container_mac.h index 8b9de53..c46430f 100644 --- a/content/browser/renderer_host/accelerated_surface_container_mac.h +++ b/content/browser/renderer_host/accelerated_surface_container_mac.h @@ -31,7 +31,7 @@ #include "base/basictypes.h" #include "base/mac/scoped_cftyperef.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" #include "ui/gfx/surface/transport_dib.h" diff --git a/content/browser/renderer_host/audio_renderer_host.h b/content/browser/renderer_host/audio_renderer_host.h index 498ab64..30dee10 100644 --- a/content/browser/renderer_host/audio_renderer_host.h +++ b/content/browser/renderer_host/audio_renderer_host.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. // @@ -56,9 +56,9 @@ #include <map> #include "base/gtest_prod_util.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/process.h" -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" #include "base/shared_memory.h" #include "content/browser/browser_message_filter.h" #include "content/browser/browser_thread.h" diff --git a/content/browser/renderer_host/audio_renderer_host_unittest.cc b/content/browser/renderer_host/audio_renderer_host_unittest.cc index ac2e7ff..6a13acd 100644 --- a/content/browser/renderer_host/audio_renderer_host_unittest.cc +++ b/content/browser/renderer_host/audio_renderer_host_unittest.cc @@ -1,11 +1,11 @@ -// 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/environment.h" +#include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/process_util.h" -#include "base/scoped_ptr.h" #include "base/sync_socket.h" #include "content/browser/browser_thread.h" #include "content/browser/renderer_host/audio_renderer_host.h" diff --git a/content/browser/renderer_host/backing_store_skia.h b/content/browser/renderer_host/backing_store_skia.h index 9f71fb0..57ff118a 100644 --- a/content/browser/renderer_host/backing_store_skia.h +++ b/content/browser/renderer_host/backing_store_skia.h @@ -6,7 +6,7 @@ #define CONTENT_BROWSER_RENDERER_HOST_BACKING_STORE_SKIA_H_ #pragma once -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "content/browser/renderer_host/backing_store.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/content/browser/renderer_host/mock_render_process_host.h b/content/browser/renderer_host/mock_render_process_host.h index abe0f82..ff6e599 100644 --- a/content/browser/renderer_host/mock_render_process_host.h +++ b/content/browser/renderer_host/mock_render_process_host.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. @@ -7,7 +7,7 @@ #pragma once #include "base/basictypes.h" -#include "base/scoped_vector.h" +#include "base/memory/scoped_vector.h" #include "content/browser/renderer_host/render_process_host.h" #include "ipc/ipc_test_sink.h" diff --git a/content/browser/renderer_host/pepper_file_message_filter.h b/content/browser/renderer_host/pepper_file_message_filter.h index 7fa0212..a241b44 100644 --- a/content/browser/renderer_host/pepper_file_message_filter.h +++ b/content/browser/renderer_host/pepper_file_message_filter.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. @@ -10,8 +10,8 @@ #include <vector> #include "base/file_path.h" +#include "base/memory/ref_counted.h" #include "base/process.h" -#include "base/ref_counted.h" #include "base/task.h" #include "build/build_config.h" #include "content/browser/browser_message_filter.h" diff --git a/content/browser/renderer_host/redirect_to_file_resource_handler.h b/content/browser/renderer_host/redirect_to_file_resource_handler.h index 46b7c2b..cf30099 100644 --- a/content/browser/renderer_host/redirect_to_file_resource_handler.h +++ b/content/browser/renderer_host/redirect_to_file_resource_handler.h @@ -6,10 +6,10 @@ #define CONTENT_BROWSER_RENDERER_HOST_REDIRECT_TO_FILE_RESOURCE_HANDLER_H_ #include "base/file_path.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_callback_factory.h" +#include "base/memory/scoped_ptr.h" #include "base/platform_file.h" -#include "base/ref_counted.h" -#include "base/scoped_callback_factory.h" -#include "base/scoped_ptr.h" #include "content/browser/renderer_host/resource_handler.h" #include "net/base/completion_callback.h" diff --git a/content/browser/renderer_host/render_message_filter.h b/content/browser/renderer_host/render_message_filter.h index d014434..25014f8 100644 --- a/content/browser/renderer_host/render_message_filter.h +++ b/content/browser/renderer_host/render_message_filter.h @@ -14,7 +14,7 @@ #include <vector> #include "base/file_path.h" -#include "base/linked_ptr.h" +#include "base/memory/linked_ptr.h" #include "base/shared_memory.h" #include "base/string16.h" #include "base/task.h" diff --git a/content/browser/renderer_host/render_process_host.h b/content/browser/renderer_host/render_process_host.h index b55d8a1..d389bdf 100644 --- a/content/browser/renderer_host/render_process_host.h +++ b/content/browser/renderer_host/render_process_host.h @@ -9,9 +9,9 @@ #include <set> #include "base/id_map.h" +#include "base/memory/scoped_ptr.h" #include "base/process.h" #include "base/process_util.h" -#include "base/scoped_ptr.h" #include "base/time.h" #include "chrome/common/visitedlink_common.h" #include "ipc/ipc_sync_channel.h" diff --git a/content/browser/renderer_host/render_sandbox_host_linux.cc b/content/browser/renderer_host/render_sandbox_host_linux.cc index ee944c2..d0b85c12 100644 --- a/content/browser/renderer_host/render_sandbox_host_linux.cc +++ b/content/browser/renderer_host/render_sandbox_host_linux.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. @@ -19,11 +19,11 @@ #include "base/command_line.h" #include "base/eintr_wrapper.h" #include "base/linux_util.h" +#include "base/memory/scoped_ptr.h" +#include "base/memory/singleton.h" #include "base/pickle.h" #include "base/process_util.h" -#include "base/scoped_ptr.h" #include "base/shared_memory.h" -#include "base/singleton.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "content/common/font_config_ipc_linux.h" diff --git a/content/browser/renderer_host/render_view_host.h b/content/browser/renderer_host/render_view_host.h index 66ee70f..d45c749 100644 --- a/content/browser/renderer_host/render_view_host.h +++ b/content/browser/renderer_host/render_view_host.h @@ -9,8 +9,8 @@ #include <string> #include <vector> +#include "base/memory/scoped_ptr.h" #include "base/process_util.h" -#include "base/scoped_ptr.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" #include "chrome/common/content_settings_types.h" #include "chrome/common/render_view_commands.h" diff --git a/content/browser/renderer_host/render_view_host_delegate.cc b/content/browser/renderer_host/render_view_host_delegate.cc index 2fe7459..72b12b7 100644 --- a/content/browser/renderer_host/render_view_host_delegate.cc +++ b/content/browser/renderer_host/render_view_host_delegate.cc @@ -4,7 +4,7 @@ #include "content/browser/renderer_host/render_view_host_delegate.h" -#include "base/singleton.h" +#include "base/memory/singleton.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" #include "content/common/renderer_preferences.h" diff --git a/content/browser/renderer_host/render_view_host_delegate.h b/content/browser/renderer_host/render_view_host_delegate.h index 2b2d6e1..be8d04e 100644 --- a/content/browser/renderer_host/render_view_host_delegate.h +++ b/content/browser/renderer_host/render_view_host_delegate.h @@ -10,8 +10,8 @@ #include <vector> #include "base/basictypes.h" +#include "base/memory/ref_counted.h" #include "base/process_util.h" -#include "base/ref_counted.h" #include "base/string16.h" #include "chrome/common/content_settings_types.h" #include "chrome/common/translate_errors.h" diff --git a/content/browser/renderer_host/render_view_host_manager_browsertest.cc b/content/browser/renderer_host/render_view_host_manager_browsertest.cc index d4efbf5..775d3ab 100644 --- a/content/browser/renderer_host/render_view_host_manager_browsertest.cc +++ b/content/browser/renderer_host/render_view_host_manager_browsertest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/file_util.h" +#include "base/memory/ref_counted.h" #include "base/path_service.h" -#include "base/ref_counted.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/extensions/extension_error_reporter.h" #include "chrome/browser/profiles/profile.h" diff --git a/content/browser/renderer_host/render_widget_helper.h b/content/browser/renderer_host/render_widget_helper.h index 91c9a58..6576700 100644 --- a/content/browser/renderer_host/render_widget_helper.h +++ b/content/browser/renderer_host/render_widget_helper.h @@ -10,8 +10,8 @@ #include "base/atomic_sequence_num.h" #include "base/hash_tables.h" +#include "base/memory/ref_counted.h" #include "base/process.h" -#include "base/ref_counted.h" #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" #include "content/common/window_container_type.h" diff --git a/content/browser/renderer_host/render_widget_host.h b/content/browser/renderer_host/render_widget_host.h index 0383883..9ed7ccd 100644 --- a/content/browser/renderer_host/render_widget_host.h +++ b/content/browser/renderer_host/render_widget_host.h @@ -11,8 +11,8 @@ #include <vector> #include "base/gtest_prod_util.h" +#include "base/memory/scoped_ptr.h" #include "base/process_util.h" -#include "base/scoped_ptr.h" #include "base/string16.h" #include "base/timer.h" #include "content/common/edit_command.h" diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc index 39a05fb..cc759ab 100644 --- a/content/browser/renderer_host/render_widget_host_unittest.cc +++ b/content/browser/renderer_host/render_widget_host_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/shared_memory.h" #include "base/timer.h" #include "build/build_config.h" diff --git a/content/browser/renderer_host/resource_dispatcher_host.cc b/content/browser/renderer_host/resource_dispatcher_host.cc index 9d5e429..b8392d0 100644 --- a/content/browser/renderer_host/resource_dispatcher_host.cc +++ b/content/browser/renderer_host/resource_dispatcher_host.cc @@ -11,9 +11,9 @@ #include "base/command_line.h" #include "base/logging.h" +#include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" -#include "base/scoped_ptr.h" #include "base/shared_memory.h" #include "base/stl_util-inl.h" #include "base/time.h" diff --git a/content/browser/renderer_host/resource_dispatcher_host.h b/content/browser/renderer_host/resource_dispatcher_host.h index 33757df..81af12e 100644 --- a/content/browser/renderer_host/resource_dispatcher_host.h +++ b/content/browser/renderer_host/resource_dispatcher_host.h @@ -19,8 +19,8 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" +#include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/scoped_ptr.h" #include "base/timer.h" #include "content/browser/renderer_host/resource_queue.h" #include "content/common/child_process_info.h" diff --git a/content/browser/renderer_host/resource_message_filter.h b/content/browser/renderer_host/resource_message_filter.h index 6fc8fe0..ee41f06 100644 --- a/content/browser/renderer_host/resource_message_filter.h +++ b/content/browser/renderer_host/resource_message_filter.h @@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_RENDERER_HOST_RESOURCE_MESSAGE_FILTER_H_ #define CONTENT_BROWSER_RENDERER_HOST_RESOURCE_MESSAGE_FILTER_H_ -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "content/browser/browser_message_filter.h" #include "content/common/child_process_info.h" #include "webkit/glue/resource_type.h" diff --git a/content/browser/renderer_host/resource_queue_unittest.cc b/content/browser/renderer_host/resource_queue_unittest.cc index 62d7b97..3d54729 100644 --- a/content/browser/renderer_host/resource_queue_unittest.cc +++ b/content/browser/renderer_host/resource_queue_unittest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/scoped_ptr.h" #include "content/browser/browser_thread.h" #include "content/browser/renderer_host/global_request_id.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" diff --git a/content/browser/renderer_host/socket_stream_host.h b/content/browser/renderer_host/socket_stream_host.h index 249b35c..279c15d 100644 --- a/content/browser/renderer_host/socket_stream_host.h +++ b/content/browser/renderer_host/socket_stream_host.h @@ -8,7 +8,7 @@ #include <vector> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "net/socket_stream/socket_stream.h" class GURL; diff --git a/content/browser/renderer_host/x509_user_cert_resource_handler.h b/content/browser/renderer_host/x509_user_cert_resource_handler.h index 0d2df61..454418e 100644 --- a/content/browser/renderer_host/x509_user_cert_resource_handler.h +++ b/content/browser/renderer_host/x509_user_cert_resource_handler.h @@ -8,7 +8,7 @@ #include <string> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "content/browser/renderer_host/resource_handler.h" #include "googleurl/src/gurl.h" |