diff options
36 files changed, 36 insertions, 29 deletions
diff --git a/base/file_util_proxy.h b/base/file_util_proxy.h index 08df57b..e0b04cb 100644 --- a/base/file_util_proxy.h +++ b/base/file_util_proxy.h @@ -8,7 +8,7 @@ #include <vector> #include "base/base_api.h" -#include "base/callback.h" +#include "base/callback_old.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/memory/ref_counted.h" diff --git a/base/memory/scoped_callback_factory.h b/base/memory/scoped_callback_factory.h index a9c58a0..2c2b0eb 100644 --- a/base/memory/scoped_callback_factory.h +++ b/base/memory/scoped_callback_factory.h @@ -36,7 +36,7 @@ #ifndef BASE_MEMORY_SCOPED_CALLBACK_FACTORY_H_ #define BASE_MEMORY_SCOPED_CALLBACK_FACTORY_H_ -#include "base/callback.h" +#include "base/callback_old.h" #include "base/memory/weak_ptr.h" namespace base { diff --git a/base/observer_list_threadsafe.h b/base/observer_list_threadsafe.h index 43c6913..31e0cae 100644 --- a/base/observer_list_threadsafe.h +++ b/base/observer_list_threadsafe.h @@ -10,7 +10,7 @@ #include <map> #include "base/basictypes.h" -#include "base/callback.h" +#include "base/callback_old.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/message_loop.h" diff --git a/chrome/browser/favicon/favicon_service.h b/chrome/browser/favicon/favicon_service.h index 48d81e8..04cec79 100644 --- a/chrome/browser/favicon/favicon_service.h +++ b/chrome/browser/favicon/favicon_service.h @@ -8,6 +8,7 @@ #include <vector> +#include "base/callback_old.h" #include "base/memory/ref_counted.h" #include "base/memory/ref_counted_memory.h" #include "base/task.h" diff --git a/chrome/browser/history/history.h b/chrome/browser/history/history.h index 95c40d5..5fcf1ea 100644 --- a/chrome/browser/history/history.h +++ b/chrome/browser/history/history.h @@ -11,7 +11,7 @@ #include "app/sql/init_status.h" #include "base/basictypes.h" -#include "base/callback.h" +#include "base/callback_old.h" #include "base/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/ui/crypto_module_password_dialog.h b/chrome/browser/ui/crypto_module_password_dialog.h index c1e70d7..5b669e0 100644 --- a/chrome/browser/ui/crypto_module_password_dialog.h +++ b/chrome/browser/ui/crypto_module_password_dialog.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/callback_old.h" #include "base/memory/ref_counted.h" namespace crypto { diff --git a/content/browser/certificate_manager_model.cc b/content/browser/certificate_manager_model.cc index e7b1daf..489fb8c 100644 --- a/content/browser/certificate_manager_model.cc +++ b/content/browser/certificate_manager_model.cc @@ -4,6 +4,7 @@ #include "content/browser/certificate_manager_model.h" +#include "base/callback_old.h" #include "base/i18n/time_formatting.h" #include "base/logging.h" #include "base/utf_string_conversions.h" diff --git a/content/browser/geolocation/access_token_store.h b/content/browser/geolocation/access_token_store.h index 18a8329..ce42801 100644 --- a/content/browser/geolocation/access_token_store.h +++ b/content/browser/geolocation/access_token_store.h @@ -16,6 +16,7 @@ #include <map> +#include "base/callback_old.h" #include "base/memory/ref_counted.h" #include "base/string16.h" #include "content/browser/cancelable_request.h" diff --git a/content/browser/gpu/gpu_data_manager.h b/content/browser/gpu/gpu_data_manager.h index 77199e0..1f5f86e 100644 --- a/content/browser/gpu/gpu_data_manager.h +++ b/content/browser/gpu/gpu_data_manager.h @@ -9,7 +9,7 @@ #include <set> #include <string> -#include "base/callback.h" +#include "base/callback_old.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/synchronization/lock.h" diff --git a/content/browser/gpu/gpu_process_host.h b/content/browser/gpu/gpu_process_host.h index 17ba8fe..abf7280 100644 --- a/content/browser/gpu/gpu_process_host.h +++ b/content/browser/gpu/gpu_process_host.h @@ -9,7 +9,7 @@ #include <map> #include <queue> -#include "base/callback.h" +#include "base/callback_old.h" #include "base/memory/linked_ptr.h" #include "base/threading/non_thread_safe.h" #include "content/browser/browser_child_process_host.h" diff --git a/content/browser/renderer_host/render_view_host_notification_task.h b/content/browser/renderer_host/render_view_host_notification_task.h index c8f5753..c1904ba 100644 --- a/content/browser/renderer_host/render_view_host_notification_task.h +++ b/content/browser/renderer_host/render_view_host_notification_task.h @@ -11,7 +11,7 @@ #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_NOTIFICATION_TASK_H_ #pragma once -#include "base/callback.h" +#include "base/callback_old.h" #include "base/task.h" #include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.h" diff --git a/content/browser/webui/web_ui.h b/content/browser/webui/web_ui.h index 910fc5c..ebf7867 100644 --- a/content/browser/webui/web_ui.h +++ b/content/browser/webui/web_ui.h @@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/callback_old.h" #include "base/compiler_specific.h" #include "base/string16.h" #include "content/common/page_transition_types.h" diff --git a/gpu/command_buffer/service/command_buffer_service.h b/gpu/command_buffer/service/command_buffer_service.h index a9bc9dfc..f8d3744 100644 --- a/gpu/command_buffer/service/command_buffer_service.h +++ b/gpu/command_buffer/service/command_buffer_service.h @@ -8,7 +8,7 @@ #include <set> #include <vector> -#include "base/callback.h" +#include "base/callback_old.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/shared_memory.h" diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.h b/gpu/command_buffer/service/gles2_cmd_decoder.h index cb28d21..edc5637 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.h +++ b/gpu/command_buffer/service/gles2_cmd_decoder.h @@ -10,6 +10,7 @@ #include <vector> #include "base/callback.h" +#include "base/callback_old.h" #include "build/build_config.h" #include "gpu/command_buffer/service/common_decoder.h" #include "ui/gfx/size.h" diff --git a/gpu/common/gpu_trace_event.h b/gpu/common/gpu_trace_event.h index 581b66e..cfc7e24 100644 --- a/gpu/common/gpu_trace_event.h +++ b/gpu/common/gpu_trace_event.h @@ -65,6 +65,7 @@ #include <string> +#include "base/callback_old.h" #include "base/memory/scoped_ptr.h" #include "base/atomicops.h" #include "base/memory/scoped_vector.h" diff --git a/media/base/callback.h b/media/base/callback.h index 8b819bc..460af24 100644 --- a/media/base/callback.h +++ b/media/base/callback.h @@ -21,7 +21,7 @@ #include <vector> -#include "base/callback.h" +#include "base/callback_old.h" #include "base/memory/scoped_ptr.h" #include "base/task.h" diff --git a/media/base/filter_factories.h b/media/base/filter_factories.h index b716041..5286b3f 100644 --- a/media/base/filter_factories.h +++ b/media/base/filter_factories.h @@ -7,7 +7,7 @@ #include<string> -#include "base/callback.h" +#include "base/callback_old.h" #include "media/base/pipeline_status.h" namespace media { diff --git a/media/base/filters.h b/media/base/filters.h index 7c13bea..f569e73 100644 --- a/media/base/filters.h +++ b/media/base/filters.h @@ -27,6 +27,7 @@ #include <string> #include "base/callback.h" +#include "base/callback_old.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/time.h" diff --git a/media/base/pipeline_status.h b/media/base/pipeline_status.h index 84c8d4f..3fc222d 100644 --- a/media/base/pipeline_status.h +++ b/media/base/pipeline_status.h @@ -5,7 +5,7 @@ #ifndef MEDIA_BASE_PIPELINE_STATUS_H_ #define MEDIA_BASE_PIPELINE_STATUS_H_ -#include "base/callback.h" +#include "base/callback_old.h" namespace media { diff --git a/media/filters/audio_renderer_algorithm_base.h b/media/filters/audio_renderer_algorithm_base.h index ae7fdab..f6ead0d 100644 --- a/media/filters/audio_renderer_algorithm_base.h +++ b/media/filters/audio_renderer_algorithm_base.h @@ -25,7 +25,7 @@ #include <deque> -#include "base/callback.h" +#include "base/callback_old.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "media/base/seekable_buffer.h" diff --git a/media/video/omx_video_decode_engine.h b/media/video/omx_video_decode_engine.h index 26b6bcf..e9cc756 100644 --- a/media/video/omx_video_decode_engine.h +++ b/media/video/omx_video_decode_engine.h @@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/callback_old.h" #include "base/memory/scoped_ptr.h" #include "media/omx/omx_configurator.h" #include "media/video/video_decode_engine.h" diff --git a/media/video/video_decode_accelerator.h b/media/video/video_decode_accelerator.h index be799c11..cece4d8 100644 --- a/media/video/video_decode_accelerator.h +++ b/media/video/video_decode_accelerator.h @@ -8,7 +8,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/callback.h" +#include "base/callback_old.h" #include "media/base/bitstream_buffer.h" #include "ui/gfx/size.h" diff --git a/net/base/completion_callback.h b/net/base/completion_callback.h index 739d86d..23d0166 100644 --- a/net/base/completion_callback.h +++ b/net/base/completion_callback.h @@ -6,7 +6,7 @@ #define NET_BASE_COMPLETION_CALLBACK_H__ #pragma once -#include "base/callback.h" +#include "base/callback_old.h" namespace net { diff --git a/printing/printing_context.h b/printing/printing_context.h index c4e2094..8247aca 100644 --- a/printing/printing_context.h +++ b/printing/printing_context.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/callback.h" +#include "base/callback_old.h" #include "base/string16.h" #include "printing/print_settings.h" #include "ui/gfx/native_widget_types.h" diff --git a/remoting/base/encoder.h b/remoting/base/encoder.h index e34e155..65b74a4 100644 --- a/remoting/base/encoder.h +++ b/remoting/base/encoder.h @@ -6,7 +6,7 @@ #define REMOTING_BASE_ENCODER_H_ #include "base/basictypes.h" -#include "base/callback.h" +#include "base/callback_old.h" #include "media/base/data_buffer.h" namespace media { diff --git a/remoting/jingle_glue/iq_request.h b/remoting/jingle_glue/iq_request.h index db85b96..f5a9b3e 100644 --- a/remoting/jingle_glue/iq_request.h +++ b/remoting/jingle_glue/iq_request.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/callback_old.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "remoting/jingle_glue/xmpp_proxy.h" diff --git a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/callback.h b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/callback.h index 5f41f64..0f42a91 100644 --- a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/callback.h +++ b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/callback.h @@ -5,7 +5,7 @@ #ifndef GOOGLE_CACHEINVALIDATION_CALLBACK_H_ #define GOOGLE_CACHEINVALIDATION_CALLBACK_H_ -#include "base/callback.h" +#include "base/callback_old.h" #define INVALIDATION_CALLBACK1_TYPE(Arg1) ::Callback1<Arg1>::Type diff --git a/webkit/fileapi/file_system_path_manager.h b/webkit/fileapi/file_system_path_manager.h index da21bd6..6754cb3 100644 --- a/webkit/fileapi/file_system_path_manager.h +++ b/webkit/fileapi/file_system_path_manager.h @@ -6,7 +6,7 @@ #define WEBKIT_FILEAPI_FILE_SYSTEM_PATH_MANAGER_H_ #pragma once -#include "base/callback.h" +#include "base/callback_old.h" #include "base/file_path.h" #include "base/file_util.h" #include "webkit/fileapi/file_system_types.h" diff --git a/webkit/glue/alt_error_page_resource_fetcher.h b/webkit/glue/alt_error_page_resource_fetcher.h index 60dca47..e2681b9 100644 --- a/webkit/glue/alt_error_page_resource_fetcher.h +++ b/webkit/glue/alt_error_page_resource_fetcher.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_GLUE_ALT_ERROR_PAGE_RESOURCE_FETCHER_H_ #define WEBKIT_GLUE_ALT_ERROR_PAGE_RESOURCE_FETCHER_H_ -#include "base/callback.h" +#include "base/callback_old.h" #include "base/memory/scoped_ptr.h" #include "googleurl/src/gurl.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h" diff --git a/webkit/glue/cpp_bound_class.h b/webkit/glue/cpp_bound_class.h index 8335a0a..796f5c2 100644 --- a/webkit/glue/cpp_bound_class.h +++ b/webkit/glue/cpp_bound_class.h @@ -23,7 +23,7 @@ #include "webkit/glue/cpp_variant.h" -#include "base/callback.h" +#include "base/callback_old.h" #include "base/memory/scoped_ptr.h" namespace WebKit { diff --git a/webkit/glue/image_resource_fetcher.h b/webkit/glue/image_resource_fetcher.h index ff69bdb..a90d019 100644 --- a/webkit/glue/image_resource_fetcher.h +++ b/webkit/glue/image_resource_fetcher.h @@ -6,7 +6,7 @@ #define WEBKIT_GLUE_IMAGE_RESOURCE_FETCHER_H_ #include "base/basictypes.h" -#include "base/callback.h" +#include "base/callback_old.h" #include "webkit/glue/resource_fetcher.h" class SkBitmap; diff --git a/webkit/glue/media/web_data_source.h b/webkit/glue/media/web_data_source.h index 25f1258..8a581f6 100644 --- a/webkit/glue/media/web_data_source.h +++ b/webkit/glue/media/web_data_source.h @@ -5,6 +5,7 @@ #ifndef WEBKIT_GLUE_MEDIA_WEB_DATA_SOURCE_H_ #define WEBKIT_GLUE_MEDIA_WEB_DATA_SOURCE_H_ +#include "base/callback_old.h" #include "media/base/filters.h" #include "media/base/pipeline_status.h" diff --git a/webkit/glue/resource_fetcher.h b/webkit/glue/resource_fetcher.h index 6af9b54..ca666c7 100644 --- a/webkit/glue/resource_fetcher.h +++ b/webkit/glue/resource_fetcher.h @@ -15,7 +15,7 @@ #include <string> #include "base/basictypes.h" -#include "base/callback.h" +#include "base/callback_old.h" #include "base/memory/scoped_ptr.h" #include "base/timer.h" #include "googleurl/src/gurl.h" diff --git a/webkit/plugins/ppapi/plugin_delegate.h b/webkit/plugins/ppapi/plugin_delegate.h index 671196a..bbd7cfe 100644 --- a/webkit/plugins/ppapi/plugin_delegate.h +++ b/webkit/plugins/ppapi/plugin_delegate.h @@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/callback_old.h" #include "base/message_loop_proxy.h" #include "base/memory/ref_counted.h" #include "base/platform_file.h" diff --git a/webkit/quota/quota_client.h b/webkit/quota/quota_client.h index 41db15b..3e46159 100644 --- a/webkit/quota/quota_client.h +++ b/webkit/quota/quota_client.h @@ -8,7 +8,7 @@ #include <set> #include <list> -#include "base/callback.h" +#include "base/callback_old.h" #include "base/time.h" #include "googleurl/src/gurl.h" #include "webkit/quota/quota_types.h" diff --git a/webkit/quota/quota_types.h b/webkit/quota/quota_types.h index c01b97a..2d42440 100644 --- a/webkit/quota/quota_types.h +++ b/webkit/quota/quota_types.h @@ -11,7 +11,7 @@ #include <string> #include "base/basictypes.h" -#include "base/callback.h" +#include "base/callback_old.h" #include "base/stl_util-inl.h" namespace quota { |