diff options
50 files changed, 99 insertions, 113 deletions
diff --git a/base/base.gypi b/base/base.gypi index 198ee91..a45cea6 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -221,7 +221,6 @@ 'memory/weak_ptr.h', 'message_loop.cc', 'message_loop.h', - 'message_loop_helpers.h', 'message_loop_proxy.cc', 'message_loop_proxy.h', 'message_loop_proxy_impl.cc', diff --git a/base/message_loop_helpers.h b/base/message_loop_helpers.h deleted file mode 100644 index 931f02d..0000000 --- a/base/message_loop_helpers.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2012 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. - -#ifndef BASE_MESSAGE_LOOP_HELPERS_H_ -#define BASE_MESSAGE_LOOP_HELPERS_H_ -#pragma once - -// TODO(akalin): Change all includers of message_loop_helpers.h to -// include sequenced_task_runner_helpers.h instead. -#include "base/sequenced_task_runner_helpers.h" - -#endif // BASE_MESSAGE_LOOP_HELPERS_H_ diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h index 1d835e5..27f9ee8 100644 --- a/chrome/browser/automation/automation_provider.h +++ b/chrome/browser/automation/automation_provider.h @@ -21,8 +21,8 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/message_loop_helpers.h" #include "base/observer_list.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/string16.h" #include "chrome/browser/autofill/field_types.h" #include "chrome/browser/cancelable_request.h" diff --git a/chrome/browser/automation/automation_provider_observers.h b/chrome/browser/automation/automation_provider_observers.h index d5e31db..47daa41 100644 --- a/chrome/browser/automation/automation_provider_observers.h +++ b/chrome/browser/automation/automation_provider_observers.h @@ -16,7 +16,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/synchronization/waitable_event.h" #include "base/values.h" #include "chrome/browser/autofill/personal_data_manager.h" diff --git a/chrome/browser/browsing_data_quota_helper.h b/chrome/browser/browsing_data_quota_helper.h index 9d4d9fc..b635fc0 100644 --- a/chrome/browser/browsing_data_quota_helper.h +++ b/chrome/browser/browsing_data_quota_helper.h @@ -11,8 +11,8 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" -#include "base/message_loop_helpers.h" #include "base/message_loop_proxy.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/time.h" #include "content/public/browser/browser_thread.h" #include "webkit/quota/quota_types.h" diff --git a/chrome/browser/browsing_data_remover.h b/chrome/browser/browsing_data_remover.h index d89541c..af71067 100644 --- a/chrome/browser/browsing_data_remover.h +++ b/chrome/browser/browsing_data_remover.h @@ -10,8 +10,8 @@ #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" -#include "base/message_loop_helpers.h" #include "base/observer_list.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/synchronization/waitable_event_watcher.h" #include "base/time.h" #include "chrome/browser/cancelable_request.h" diff --git a/chrome/browser/chromeos/login/screen_locker.h b/chrome/browser/chromeos/login/screen_locker.h index 863abca..d968304 100644 --- a/chrome/browser/chromeos/login/screen_locker.h +++ b/chrome/browser/chromeos/login/screen_locker.h @@ -10,7 +10,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/time.h" #include "chrome/browser/chromeos/login/help_app_launcher.h" #include "chrome/browser/chromeos/login/login_status_consumer.h" diff --git a/chrome/browser/chromeos/web_socket_proxy.cc b/chrome/browser/chromeos/web_socket_proxy.cc index 441b5b8..eb7ef07 100644 --- a/chrome/browser/chromeos/web_socket_proxy.cc +++ b/chrome/browser/chromeos/web_socket_proxy.cc @@ -32,7 +32,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/sha1.h" #include "base/stl_util.h" #include "base/string_number_conversions.h" diff --git a/chrome/browser/extensions/extension_data_deleter.h b/chrome/browser/extensions/extension_data_deleter.h index 41c781b..0b74f00 100644 --- a/chrome/browser/extensions/extension_data_deleter.h +++ b/chrome/browser/extensions/extension_data_deleter.h @@ -8,7 +8,7 @@ #include "base/file_path.h" #include "base/memory/ref_counted.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/string16.h" #include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/extensions/extension_function.h b/chrome/browser/extensions/extension_function.h index b311e77..ec84ddf 100644 --- a/chrome/browser/extensions/extension_function.h +++ b/chrome/browser/extensions/extension_function.h @@ -13,8 +13,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/message_loop_helpers.h" #include "base/process.h" +#include "base/sequenced_task_runner_helpers.h" #include "chrome/browser/extensions/extension_info_map.h" #include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/printing/print_dialog_gtk.h b/chrome/browser/printing/print_dialog_gtk.h index e5d4370..02cc936 100644 --- a/chrome/browser/printing/print_dialog_gtk.h +++ b/chrome/browser/printing/print_dialog_gtk.h @@ -12,7 +12,7 @@ #include "base/compiler_specific.h" #include "base/file_path.h" #include "base/memory/ref_counted.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "content/public/browser/browser_thread.h" #include "printing/print_dialog_gtk_interface.h" #include "printing/printing_context_gtk.h" diff --git a/chrome/browser/printing/print_system_task_proxy.h b/chrome/browser/printing/print_system_task_proxy.h index 9bf1581..046d965 100644 --- a/chrome/browser/printing/print_system_task_proxy.h +++ b/chrome/browser/printing/print_system_task_proxy.h @@ -11,7 +11,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "build/build_config.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/process_singleton_linux.cc b/chrome/browser/process_singleton_linux.cc index f2faeca8..a31297b 100644 --- a/chrome/browser/process_singleton_linux.cc +++ b/chrome/browser/process_singleton_linux.cc @@ -64,11 +64,11 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/message_loop_helpers.h" #include "base/path_service.h" #include "base/process_util.h" #include "base/rand_util.h" #include "base/safe_strerror_posix.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/stl_util.h" #include "base/string_number_conversions.h" #include "base/string_split.h" diff --git a/chrome/browser/protector/protector_service.h b/chrome/browser/protector/protector_service.h index 843879b..8fcd126 100644 --- a/chrome/browser/protector/protector_service.h +++ b/chrome/browser/protector/protector_service.h @@ -12,7 +12,7 @@ #include "base/compiler_specific.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "chrome/browser/profiles/profile_keyed_service.h" #include "chrome/browser/protector/base_setting_change.h" #include "chrome/browser/protector/settings_change_global_error_delegate.h" diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.h b/chrome/browser/renderer_host/chrome_render_message_filter.h index 5f5db95..af0b82b 100644 --- a/chrome/browser/renderer_host/chrome_render_message_filter.h +++ b/chrome/browser/renderer_host/chrome_render_message_filter.h @@ -11,7 +11,7 @@ #include "base/file_path.h" #include "base/memory/weak_ptr.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/content_settings.h" #include "content/public/browser/browser_message_filter.h" diff --git a/chrome/browser/safe_browsing/browser_feature_extractor.h b/chrome/browser/safe_browsing/browser_feature_extractor.h index d7cf68f..a03bb21 100644 --- a/chrome/browser/safe_browsing/browser_feature_extractor.h +++ b/chrome/browser/safe_browsing/browser_feature_extractor.h @@ -20,7 +20,7 @@ #include "base/basictypes.h" #include "base/callback.h" #include "base/memory/scoped_ptr.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/time.h" #include "chrome/browser/cancelable_request.h" #include "chrome/browser/history/history_types.h" diff --git a/chrome/browser/safe_browsing/client_side_detection_host.cc b/chrome/browser/safe_browsing/client_side_detection_host.cc index 2d9c154..ce24410 100644 --- a/chrome/browser/safe_browsing/client_side_detection_host.cc +++ b/chrome/browser/safe_browsing/client_side_detection_host.cc @@ -9,8 +9,8 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/message_loop_helpers.h" #include "base/metrics/histogram.h" +#include "base/sequenced_task_runner_helpers.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" @@ -21,7 +21,6 @@ #include "chrome/common/pref_names.h" #include "chrome/common/safe_browsing/csd.pb.h" #include "chrome/common/safe_browsing/safebrowsing_messages.h" -#include "content/public/browser/resource_request_details.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_details.h" @@ -31,6 +30,7 @@ #include "content/public/browser/notification_types.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" +#include "content/public/browser/resource_request_details.h" #include "content/public/browser/web_contents.h" #include "content/public/common/frame_navigate_params.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/safe_browsing/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection_service.cc index 385d108..0b89eaa 100644 --- a/chrome/browser/safe_browsing/download_protection_service.cc +++ b/chrome/browser/safe_browsing/download_protection_service.cc @@ -9,8 +9,8 @@ #include "base/format_macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/message_loop_helpers.h" #include "base/metrics/histogram.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/stl_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" diff --git a/chrome/browser/safe_browsing/malware_details_history.h b/chrome/browser/safe_browsing/malware_details_history.h index 0b9df87..6db4094 100644 --- a/chrome/browser/safe_browsing/malware_details_history.h +++ b/chrome/browser/safe_browsing/malware_details_history.h @@ -15,7 +15,7 @@ #include "base/hash_tables.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "chrome/browser/history/history.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_service.h b/chrome/browser/safe_browsing/safe_browsing_service.h index 85eb5ef..e6406d2 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.h +++ b/chrome/browser/safe_browsing/safe_browsing_service.h @@ -19,8 +19,8 @@ #include "base/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/message_loop_helpers.h" #include "base/observer_list.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/synchronization/lock.h" #include "base/time.h" #include "chrome/browser/safe_browsing/safe_browsing_util.h" diff --git a/chrome/browser/search_engines/search_provider_install_data.cc b/chrome/browser/search_engines/search_provider_install_data.cc index d89fbf8..f75e110 100644 --- a/chrome/browser/search_engines/search_provider_install_data.cc +++ b/chrome/browser/search_engines/search_provider_install_data.cc @@ -12,7 +12,7 @@ #include "base/bind.h" #include "base/logging.h" #include "base/memory/ref_counted.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "chrome/browser/google/google_url_tracker.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/search_host_to_urls_map.h" diff --git a/chrome/browser/spellchecker/spellcheck_host_impl.h b/chrome/browser/spellchecker/spellcheck_host_impl.h index 05bd9fe..3b221cb 100644 --- a/chrome/browser/spellchecker/spellcheck_host_impl.h +++ b/chrome/browser/spellchecker/spellcheck_host_impl.h @@ -13,7 +13,7 @@ #include "base/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "chrome/browser/spellchecker/spellcheck_host.h" #include "chrome/browser/spellchecker/spellcheck_profile_provider.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/sync/glue/data_type_controller.h b/chrome/browser/sync/glue/data_type_controller.h index 52247bd..ac27fa9 100644 --- a/chrome/browser/sync/glue/data_type_controller.h +++ b/chrome/browser/sync/glue/data_type_controller.h @@ -11,7 +11,7 @@ #include "base/callback.h" #include "base/location.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "chrome/browser/sync/glue/data_type_error_handler.h" #include "content/public/browser/browser_thread.h" #include "sync/internal_api/public/engine/model_safe_worker.h" diff --git a/chrome/browser/themes/browser_theme_pack.h b/chrome/browser/themes/browser_theme_pack.h index e582692..a968a81 100644 --- a/chrome/browser/themes/browser_theme_pack.h +++ b/chrome/browser/themes/browser_theme_pack.h @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" #include "ui/gfx/color_utils.h" diff --git a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h index bd63594..a14ddc7b 100644 --- a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h +++ b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "chrome/browser/extensions/image_loading_tracker.h" #include "chrome/browser/shell_integration.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h index 15cfee3..11873c1 100644 --- a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h +++ b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h @@ -11,7 +11,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "ui/views/controls/menu/menu_delegate.h" class BrowserActionsContainer; diff --git a/chrome/browser/ui/webui/chrome_url_data_manager.h b/chrome/browser/ui/webui/chrome_url_data_manager.h index 4c22ea1..5160501 100644 --- a/chrome/browser/ui/webui/chrome_url_data_manager.h +++ b/chrome/browser/ui/webui/chrome_url_data_manager.h @@ -11,7 +11,7 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/synchronization/lock.h" #include "chrome/browser/profiles/profile_keyed_service.h" diff --git a/chrome/browser/ui/webui/media/media_internals_proxy.h b/chrome/browser/ui/webui/media/media_internals_proxy.h index 1999fca..7f3124d 100644 --- a/chrome/browser/ui/webui/media/media_internals_proxy.h +++ b/chrome/browser/ui/webui/media/media_internals_proxy.h @@ -7,7 +7,7 @@ #pragma once #include "base/memory/ref_counted.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/string16.h" #include "chrome/browser/media/media_internals_observer.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc index 9dd1418..52d1c9b 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc @@ -19,9 +19,9 @@ #include "base/memory/singleton.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" -#include "base/message_loop_helpers.h" #include "base/path_service.h" #include "base/platform_file.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/string_number_conversions.h" #include "base/string_piece.h" #include "base/string_split.h" diff --git a/chrome/browser/user_style_sheet_watcher.h b/chrome/browser/user_style_sheet_watcher.h index 228e3e2..39f5bdf 100644 --- a/chrome/browser/user_style_sheet_watcher.h +++ b/chrome/browser/user_style_sheet_watcher.h @@ -10,7 +10,7 @@ #include "base/files/file_path_watcher.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "chrome/browser/profiles/refcounted_profile_keyed_service.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/webdata/web_data_service.h b/chrome/browser/webdata/web_data_service.h index 49d327c..5e9a93c 100644 --- a/chrome/browser/webdata/web_data_service.h +++ b/chrome/browser/webdata/web_data_service.h @@ -17,8 +17,8 @@ #include "base/callback_forward.h" #include "base/file_path.h" #include "base/location.h" -#include "base/message_loop_helpers.h" #include "base/memory/ref_counted.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/synchronization/lock.h" #include "chrome/browser/profiles/refcounted_profile_keyed_service.h" #include "chrome/browser/search_engines/template_url.h" diff --git a/content/browser/appcache/chrome_appcache_service.h b/content/browser/appcache/chrome_appcache_service.h index d30b3d3..385abce 100644 --- a/content/browser/appcache/chrome_appcache_service.h +++ b/content/browser/appcache/chrome_appcache_service.h @@ -8,7 +8,7 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "content/common/content_export.h" #include "content/public/browser/browser_thread.h" #include "webkit/appcache/appcache_policy.h" diff --git a/content/browser/download/download_manager_impl.h b/content/browser/download/download_manager_impl.h index 924fa8b..bed1c18 100644 --- a/content/browser/download/download_manager_impl.h +++ b/content/browser/download/download_manager_impl.h @@ -13,8 +13,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/message_loop_helpers.h" #include "base/observer_list.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/synchronization/lock.h" #include "content/browser/download/download_item_factory.h" #include "content/browser/download/download_item_impl.h" diff --git a/content/browser/fileapi/chrome_blob_storage_context.h b/content/browser/fileapi/chrome_blob_storage_context.h index 4f737ae..11ab287 100644 --- a/content/browser/fileapi/chrome_blob_storage_context.h +++ b/content/browser/fileapi/chrome_blob_storage_context.h @@ -8,7 +8,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "content/common/content_export.h" #include "content/public/browser/browser_thread.h" diff --git a/content/browser/host_zoom_map_impl.h b/content/browser/host_zoom_map_impl.h index c1c7a70..60923fa 100644 --- a/content/browser/host_zoom_map_impl.h +++ b/content/browser/host_zoom_map_impl.h @@ -11,7 +11,7 @@ #include <vector> #include "base/compiler_specific.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/supports_user_data.h" #include "base/synchronization/lock.h" #include "content/public/browser/host_zoom_map.h" diff --git a/content/browser/renderer_host/gpu_message_filter.h b/content/browser/renderer_host/gpu_message_filter.h index e7a73f1..f7715fa 100644 --- a/content/browser/renderer_host/gpu_message_filter.h +++ b/content/browser/renderer_host/gpu_message_filter.h @@ -11,7 +11,7 @@ #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "content/common/gpu/gpu_process_launch_causes.h" #include "content/public/browser/browser_message_filter.h" #include "ui/gfx/native_widget_types.h" diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.h b/content/browser/renderer_host/media/audio_input_renderer_host.h index f8351c8..e8bec46 100644 --- a/content/browser/renderer_host/media/audio_input_renderer_host.h +++ b/content/browser/renderer_host/media/audio_input_renderer_host.h @@ -54,8 +54,8 @@ #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/message_loop_helpers.h" #include "base/process.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/shared_memory.h" #include "content/browser/renderer_host/media/audio_input_device_manager_event_handler.h" #include "content/public/browser/browser_message_filter.h" diff --git a/content/browser/renderer_host/media/audio_renderer_host.h b/content/browser/renderer_host/media/audio_renderer_host.h index cea2f3a..13dd6e2 100644 --- a/content/browser/renderer_host/media/audio_renderer_host.h +++ b/content/browser/renderer_host/media/audio_renderer_host.h @@ -43,8 +43,8 @@ #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/message_loop_helpers.h" #include "base/process.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/shared_memory.h" #include "content/common/content_export.h" #include "content/public/browser/browser_message_filter.h" diff --git a/content/browser/renderer_host/media/video_capture_host.h b/content/browser/renderer_host/media/video_capture_host.h index 7b36e02..a66f475 100644 --- a/content/browser/renderer_host/media/video_capture_host.h +++ b/content/browser/renderer_host/media/video_capture_host.h @@ -39,7 +39,7 @@ #include <map> #include "base/memory/ref_counted.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "content/browser/renderer_host/media/video_capture_controller.h" #include "content/common/content_export.h" #include "content/public/browser/browser_message_filter.h" diff --git a/content/browser/renderer_host/pepper_file_message_filter.h b/content/browser/renderer_host/pepper_file_message_filter.h index fa7bc60..9d1013d 100644 --- a/content/browser/renderer_host/pepper_file_message_filter.h +++ b/content/browser/renderer_host/pepper_file_message_filter.h @@ -11,8 +11,8 @@ #include "base/file_path.h" #include "base/memory/ref_counted.h" -#include "base/message_loop_helpers.h" #include "base/process.h" +#include "base/sequenced_task_runner_helpers.h" #include "build/build_config.h" #include "content/public/browser/browser_message_filter.h" #include "ipc/ipc_platform_file.h" diff --git a/content/browser/renderer_host/render_message_filter.h b/content/browser/renderer_host/render_message_filter.h index ab54ac3..3d5a77a 100644 --- a/content/browser/renderer_host/render_message_filter.h +++ b/content/browser/renderer_host/render_message_filter.h @@ -15,7 +15,7 @@ #include "base/file_path.h" #include "base/memory/linked_ptr.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/shared_memory.h" #include "base/string16.h" #include "build/build_config.h" diff --git a/content/browser/renderer_host/resource_handler.h b/content/browser/renderer_host/resource_handler.h index 2375ce8..1d40c16 100644 --- a/content/browser/renderer_host/resource_handler.h +++ b/content/browser/renderer_host/resource_handler.h @@ -15,7 +15,7 @@ #include <string> -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/threading/non_thread_safe.h" #include "content/common/content_export.h" #include "content/public/browser/browser_thread.h" diff --git a/content/browser/ssl/ssl_client_auth_handler.h b/content/browser/ssl/ssl_client_auth_handler.h index 0461d27..e68701e 100644 --- a/content/browser/ssl/ssl_client_auth_handler.h +++ b/content/browser/ssl/ssl_client_auth_handler.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "content/common/content_export.h" #include "content/public/browser/browser_thread.h" #include "net/base/ssl_cert_request_info.h" diff --git a/content/public/browser/download_manager.h b/content/public/browser/download_manager.h index c9874fd..e7fdf8c 100644 --- a/content/public/browser/download_manager.h +++ b/content/public/browser/download_manager.h @@ -35,7 +35,7 @@ #include "base/callback.h" #include "base/file_path.h" #include "base/gtest_prod_util.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/time.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_id.h" diff --git a/content/renderer/webplugin_delegate_proxy.h b/content/renderer/webplugin_delegate_proxy.h index 2fb046f..5e36520 100644 --- a/content/renderer/webplugin_delegate_proxy.h +++ b/content/renderer/webplugin_delegate_proxy.h @@ -12,7 +12,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_channel.h" #include "ipc/ipc_message.h" diff --git a/net/url_request/url_request_context_getter.h b/net/url_request/url_request_context_getter.h index 239a62e..6e08efd 100644 --- a/net/url_request/url_request_context_getter.h +++ b/net/url_request/url_request_context_getter.h @@ -7,7 +7,7 @@ #pragma once #include "base/memory/ref_counted.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "net/base/net_export.h" namespace base { diff --git a/webkit/plugins/npapi/webplugin_delegate_impl.h b/webkit/plugins/npapi/webplugin_delegate_impl.h index 2e5e333..c916775 100644 --- a/webkit/plugins/npapi/webplugin_delegate_impl.h +++ b/webkit/plugins/npapi/webplugin_delegate_impl.h @@ -10,15 +10,15 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/time.h" #include "base/timer.h" #include "build/build_config.h" #include "third_party/npapi/bindings/npapi.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" -#include "webkit/plugins/npapi/webplugin_delegate.h" #include "webkit/glue/webcursor.h" +#include "webkit/plugins/npapi/webplugin_delegate.h" #include "webkit/plugins/webkit_plugins_export.h" #if defined(OS_WIN) && !defined(USE_AURA) diff --git a/webkit/plugins/ppapi/gfx_conversion.h b/webkit/plugins/ppapi/gfx_conversion.h index ad4006b..80df6f5 100644 --- a/webkit/plugins/ppapi/gfx_conversion.h +++ b/webkit/plugins/ppapi/gfx_conversion.h @@ -1,48 +1,48 @@ -// 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.
-
-#ifndef WEBKIT_PLUGINS_PPAPI_GFX_CONVERSION_H_
-#define WEBKIT_PLUGINS_PPAPI_GFX_CONVERSION_H_
-
-#include "ppapi/c/pp_point.h"
-#include "ppapi/c/pp_rect.h"
-#include "ppapi/c/pp_size.h"
-#include "ui/gfx/point.h"
-#include "ui/gfx/rect.h"
-#include "ui/gfx/size.h"
-
-// Conversions for graphics types between our gfx library and PPAPI.
-// The style of naming is to match the PP_Bool conversions.
-
-namespace webkit {
-namespace ppapi {
-
-inline gfx::Point PP_ToGfxPoint(const PP_Point& p) {
- return gfx::Point(p.x, p.y);
-}
-
-inline PP_Point PP_FromGfxPoint(const gfx::Point& p) {
- return PP_MakePoint(p.x(), p.y());
-}
-
-inline gfx::Rect PP_ToGfxRect(const PP_Rect& r) {
- return gfx::Rect(r.point.x, r.point.y, r.size.width, r.size.height);
-}
-
-inline PP_Rect PP_FromGfxRect(const gfx::Rect& r) {
- return PP_MakeRectFromXYWH(r.x(), r.y(), r.width(), r.height());
-}
-
-inline gfx::Size PP_ToGfxSize(const PP_Size& s) {
- return gfx::Size(s.width, s.height);
-}
-
-inline PP_Size PP_FromGfxSize(const gfx::Size& s) {
- return PP_MakeSize(s.width(), s.height());
-}
-
-} // namespace ppapi
-} // namespace webkit
-
-#endif // WEBKIT_PLUGINS_PPAPI_GFX_CONVERSION_H_
+// 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. + +#ifndef WEBKIT_PLUGINS_PPAPI_GFX_CONVERSION_H_ +#define WEBKIT_PLUGINS_PPAPI_GFX_CONVERSION_H_ + +#include "ppapi/c/pp_point.h" +#include "ppapi/c/pp_rect.h" +#include "ppapi/c/pp_size.h" +#include "ui/gfx/point.h" +#include "ui/gfx/rect.h" +#include "ui/gfx/size.h" + +// Conversions for graphics types between our gfx library and PPAPI. +// The style of naming is to match the PP_Bool conversions. + +namespace webkit { +namespace ppapi { + +inline gfx::Point PP_ToGfxPoint(const PP_Point& p) { + return gfx::Point(p.x, p.y); +} + +inline PP_Point PP_FromGfxPoint(const gfx::Point& p) { + return PP_MakePoint(p.x(), p.y()); +} + +inline gfx::Rect PP_ToGfxRect(const PP_Rect& r) { + return gfx::Rect(r.point.x, r.point.y, r.size.width, r.size.height); +} + +inline PP_Rect PP_FromGfxRect(const gfx::Rect& r) { + return PP_MakeRectFromXYWH(r.x(), r.y(), r.width(), r.height()); +} + +inline gfx::Size PP_ToGfxSize(const PP_Size& s) { + return gfx::Size(s.width, s.height); +} + +inline PP_Size PP_FromGfxSize(const gfx::Size& s) { + return PP_MakeSize(s.width(), s.height()); +} + +} // namespace ppapi +} // namespace webkit + +#endif // WEBKIT_PLUGINS_PPAPI_GFX_CONVERSION_H_ diff --git a/webkit/plugins/ppapi/ppapi_webplugin_impl.h b/webkit/plugins/ppapi/ppapi_webplugin_impl.h index 502a3c0..0ea0080 100644 --- a/webkit/plugins/ppapi/ppapi_webplugin_impl.h +++ b/webkit/plugins/ppapi/ppapi_webplugin_impl.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "ppapi/c/pp_var.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h" #include "ui/gfx/rect.h" diff --git a/webkit/plugins/webview_plugin.h b/webkit/plugins/webview_plugin.h index 14ab44e..6377eb0 100644 --- a/webkit/plugins/webview_plugin.h +++ b/webkit/plugins/webview_plugin.h @@ -8,12 +8,12 @@ #include <list> #include "base/memory/scoped_ptr.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLResponse.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLResponse.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebViewClient.h" #include "webkit/plugins/webkit_plugins_export.h" |