diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-17 19:55:23 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-17 19:55:23 +0000 |
| commit | 8299b71930788827e96fe89a018c4ad825cd4ff7 (patch) | |
| tree | 2db58ba14712ae40e1b79b66f107bffc5c35ef19 /webkit | |
| parent | bf0f45d483b3318fd13bc276b953a30f50e4ecc4 (diff) | |
| download | chromium_src-8299b71930788827e96fe89a018c4ad825cd4ff7.zip chromium_src-8299b71930788827e96fe89a018c4ad825cd4ff7.tar.gz chromium_src-8299b71930788827e96fe89a018c4ad825cd4ff7.tar.bz2 | |
Use a direct include of the shared_memory header in media/, ppapi/, webkit/.
BUG=260807
TEST=none
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/19284015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212116 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/plugins/ppapi/audio_helper.h | 2 | ||||
| -rw-r--r-- | webkit/plugins/ppapi/host_array_buffer_var.h | 2 | ||||
| -rw-r--r-- | webkit/plugins/ppapi/plugin_delegate.h | 2 | ||||
| -rw-r--r-- | webkit/plugins/ppapi/ppb_audio_impl.h | 2 | ||||
| -rw-r--r-- | webkit/plugins/ppapi/ppb_buffer_impl.h | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/webkit/plugins/ppapi/audio_helper.h b/webkit/plugins/ppapi/audio_helper.h index 61b5205..23db069 100644 --- a/webkit/plugins/ppapi/audio_helper.h +++ b/webkit/plugins/ppapi/audio_helper.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "base/sync_socket.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/shared_impl/resource.h" diff --git a/webkit/plugins/ppapi/host_array_buffer_var.h b/webkit/plugins/ppapi/host_array_buffer_var.h index bb60a5e..52ec849 100644 --- a/webkit/plugins/ppapi/host_array_buffer_var.h +++ b/webkit/plugins/ppapi/host_array_buffer_var.h @@ -5,7 +5,7 @@ #ifndef PPAPI_WEBKIT_PLUGINS_PPAPI_HOST_ARRAY_BUFFER_VAR_H_ #define PPAPI_WEBKIT_PLUGINS_PPAPI_HOST_ARRAY_BUFFER_VAR_H_ -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "ppapi/c/pp_instance.h" #include "ppapi/shared_impl/host_resource.h" #include "ppapi/shared_impl/var.h" diff --git a/webkit/plugins/ppapi/plugin_delegate.h b/webkit/plugins/ppapi/plugin_delegate.h index cd07845..def5401 100644 --- a/webkit/plugins/ppapi/plugin_delegate.h +++ b/webkit/plugins/ppapi/plugin_delegate.h @@ -10,10 +10,10 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" +#include "base/memory/shared_memory.h" #include "base/message_loop/message_loop_proxy.h" #include "base/platform_file.h" #include "base/process.h" -#include "base/shared_memory.h" #include "base/sync_socket.h" #include "base/time/time.h" #include "ipc/ipc_platform_file.h" diff --git a/webkit/plugins/ppapi/ppb_audio_impl.h b/webkit/plugins/ppapi/ppb_audio_impl.h index 4981b12..c0c5239 100644 --- a/webkit/plugins/ppapi/ppb_audio_impl.h +++ b/webkit/plugins/ppapi/ppb_audio_impl.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "base/sync_socket.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/ppb_audio.h" diff --git a/webkit/plugins/ppapi/ppb_buffer_impl.h b/webkit/plugins/ppapi/ppb_buffer_impl.h index 0bddd13..e26d17f 100644 --- a/webkit/plugins/ppapi/ppb_buffer_impl.h +++ b/webkit/plugins/ppapi/ppb_buffer_impl.h @@ -8,9 +8,9 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/shared_memory.h" -#include "ppapi/thunk/ppb_buffer_api.h" +#include "base/memory/shared_memory.h" #include "ppapi/shared_impl/resource.h" +#include "ppapi/thunk/ppb_buffer_api.h" #include "webkit/plugins/webkit_plugins_export.h" namespace webkit { |