diff options
Diffstat (limited to 'content/renderer')
15 files changed, 18 insertions, 18 deletions
diff --git a/content/renderer/browser_plugin/browser_plugin.h b/content/renderer/browser_plugin/browser_plugin.h index 1457a53..6705acc 100644 --- a/content/renderer/browser_plugin/browser_plugin.h +++ b/content/renderer/browser_plugin/browser_plugin.h @@ -12,7 +12,7 @@ #include "base/process_util.h" #include "base/sequenced_task_runner_helpers.h" #if defined(OS_WIN) -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #endif #include "base/values.h" #include "content/common/browser_plugin/browser_plugin_message_enums.h" diff --git a/content/renderer/device_orientation/device_motion_event_pump.cc b/content/renderer/device_orientation/device_motion_event_pump.cc index 94ecb5f..0cfd774 100644 --- a/content/renderer/device_orientation/device_motion_event_pump.cc +++ b/content/renderer/device_orientation/device_motion_event_pump.cc @@ -7,8 +7,8 @@ #include "base/bind.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "base/memory/shared_memory.h" #include "base/message_loop/message_loop.h" -#include "base/shared_memory.h" #include "content/common/device_motion_messages.h" #include "content/public/renderer/render_thread.h" #include "third_party/WebKit/public/platform/WebDeviceMotionListener.h" diff --git a/content/renderer/device_orientation/device_motion_event_pump.h b/content/renderer/device_orientation/device_motion_event_pump.h index 4ced805..f2c3474 100644 --- a/content/renderer/device_orientation/device_motion_event_pump.h +++ b/content/renderer/device_orientation/device_motion_event_pump.h @@ -6,7 +6,7 @@ #define CONTENT_RENDERER_DEVICE_MOTION_EVENT_PUMP_H_ #include "base/memory/scoped_ptr.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "base/timer/timer.h" #include "content/public/renderer/render_process_observer.h" #include "content/renderer/shared_memory_seqlock_reader.h" diff --git a/content/renderer/gamepad_shared_memory_reader.h b/content/renderer/gamepad_shared_memory_reader.h index 0a0e815..8c10b90 100644 --- a/content/renderer/gamepad_shared_memory_reader.h +++ b/content/renderer/gamepad_shared_memory_reader.h @@ -5,8 +5,8 @@ #ifndef CONTENT_RENDERER_GAMEPAD_SHARED_MEMORY_READER_H_ #define CONTENT_RENDERER_GAMEPAD_SHARED_MEMORY_READER_H_ -#include "base/shared_memory.h" #include "base/memory/scoped_ptr.h" +#include "base/memory/shared_memory.h" #include "third_party/WebKit/public/platform/WebGamepads.h" namespace content { diff --git a/content/renderer/media/android/audio_decoder_android.cc b/content/renderer/media/android/audio_decoder_android.cc index 9a8b0ae..1fbdf5f 100644 --- a/content/renderer/media/android/audio_decoder_android.cc +++ b/content/renderer/media/android/audio_decoder_android.cc @@ -13,8 +13,8 @@ #include "base/file_descriptor_posix.h" #include "base/logging.h" +#include "base/memory/shared_memory.h" #include "base/posix/eintr_wrapper.h" -#include "base/shared_memory.h" #include "content/common/view_messages.h" #include "media/base/android/webaudio_media_codec_info.h" #include "media/base/audio_bus.h" diff --git a/content/renderer/media/audio_input_message_filter.h b/content/renderer/media/audio_input_message_filter.h index fcba0a7..023d090 100644 --- a/content/renderer/media/audio_input_message_filter.h +++ b/content/renderer/media/audio_input_message_filter.h @@ -7,7 +7,7 @@ #include "base/id_map.h" #include "base/memory/scoped_ptr.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "base/sync_socket.h" #include "content/common/content_export.h" #include "ipc/ipc_channel_proxy.h" diff --git a/content/renderer/media/audio_message_filter.h b/content/renderer/media/audio_message_filter.h index 38deb80..9a1597a 100644 --- a/content/renderer/media/audio_message_filter.h +++ b/content/renderer/media/audio_message_filter.h @@ -8,7 +8,7 @@ #include "base/gtest_prod_util.h" #include "base/id_map.h" #include "base/memory/scoped_ptr.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "base/sync_socket.h" #include "base/synchronization/lock.h" #include "content/common/content_export.h" diff --git a/content/renderer/media/video_capture_message_filter.h b/content/renderer/media/video_capture_message_filter.h index 9eee266..ede6ab6 100644 --- a/content/renderer/media/video_capture_message_filter.h +++ b/content/renderer/media/video_capture_message_filter.h @@ -12,8 +12,8 @@ #include <map> +#include "base/memory/shared_memory.h" #include "base/message_loop/message_loop_proxy.h" -#include "base/shared_memory.h" #include "content/common/content_export.h" #include "content/common/media/video_capture.h" #include "ipc/ipc_channel_proxy.h" diff --git a/content/renderer/media/video_capture_message_filter_unittest.cc b/content/renderer/media/video_capture_message_filter_unittest.cc index f83114e..5b4c194 100644 --- a/content/renderer/media/video_capture_message_filter_unittest.cc +++ b/content/renderer/media/video_capture_message_filter_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/shared_memory.h" #include "base/message_loop/message_loop.h" -#include "base/shared_memory.h" #include "content/common/media/video_capture_messages.h" #include "content/renderer/media/video_capture_message_filter.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/renderer/pepper/pepper_audio_input_host.h b/content/renderer/pepper/pepper_audio_input_host.h index 990c11c..c0b656c 100644 --- a/content/renderer/pepper/pepper_audio_input_host.h +++ b/content/renderer/pepper/pepper_audio_input_host.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "base/sync_socket.h" #include "content/renderer/pepper/pepper_device_enumeration_host_helper.h" #include "ipc/ipc_platform_file.h" diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 1d86366..0a2e1d0 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -15,11 +15,11 @@ #include "base/lazy_instance.h" #include "base/logging.h" #include "base/memory/discardable_memory.h" +#include "base/memory/shared_memory.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/metrics/stats_table.h" #include "base/path_service.h" -#include "base/shared_memory.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" // Temporary #include "base/strings/utf_string_conversions.h" diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc index 2be61c3..6528992 100644 --- a/content/renderer/render_view_browsertest.cc +++ b/content/renderer/render_view_browsertest.cc @@ -4,7 +4,7 @@ #include "base/basictypes.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "content/common/view_messages.h" @@ -22,13 +22,13 @@ #include "content/test/mock_keyboard.h" #include "net/base/net_errors.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/public/web/WebHistoryItem.h" -#include "third_party/WebKit/public/web/WebView.h" -#include "third_party/WebKit/public/web/WebWindowFeatures.h" #include "third_party/WebKit/public/platform/WebData.h" #include "third_party/WebKit/public/platform/WebHTTPBody.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURLError.h" +#include "third_party/WebKit/public/web/WebHistoryItem.h" +#include "third_party/WebKit/public/web/WebView.h" +#include "third_party/WebKit/public/web/WebWindowFeatures.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/range/range.h" #include "ui/gfx/codec/jpeg_codec.h" diff --git a/content/renderer/renderer_clipboard_client.cc b/content/renderer/renderer_clipboard_client.cc index c844fbe..9df9508 100644 --- a/content/renderer/renderer_clipboard_client.cc +++ b/content/renderer/renderer_clipboard_client.cc @@ -6,7 +6,7 @@ #include "content/renderer/renderer_clipboard_client.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "base/strings/string16.h" #include "content/common/clipboard_messages.h" #include "content/public/renderer/content_renderer_client.h" diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc index c4d12b3..a147108 100644 --- a/content/renderer/renderer_webkitplatformsupport_impl.cc +++ b/content/renderer/renderer_webkitplatformsupport_impl.cc @@ -7,10 +7,10 @@ #include "base/command_line.h" #include "base/files/file_path.h" #include "base/lazy_instance.h" +#include "base/memory/shared_memory.h" #include "base/message_loop/message_loop_proxy.h" #include "base/metrics/histogram.h" #include "base/platform_file.h" -#include "base/shared_memory.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "content/child/database_util.h" diff --git a/content/renderer/shared_memory_seqlock_reader.h b/content/renderer/shared_memory_seqlock_reader.h index d355d9f..1d0e60e 100644 --- a/content/renderer/shared_memory_seqlock_reader.h +++ b/content/renderer/shared_memory_seqlock_reader.h @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "content/common/shared_memory_seqlock_buffer.h" namespace internal { |