summaryrefslogtreecommitdiffstats
path: root/ui/gl
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-02 06:37:24 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-02 06:37:24 +0000
commit77c54b0a829eb264a469d19e7fdef5d11c346413 (patch)
treeb7908d7c520a53d5efe4a7f9e2b2d96575e42687 /ui/gl
parentee5440aeaa18aa51a37ca3ac638f1d96a84e5d8c (diff)
downloadchromium_src-77c54b0a829eb264a469d19e7fdef5d11c346413.zip
chromium_src-77c54b0a829eb264a469d19e7fdef5d11c346413.tar.gz
chromium_src-77c54b0a829eb264a469d19e7fdef5d11c346413.tar.bz2
ui: Update the includes of base/shared_memory.h to its new location.
shared_memory.h now lives in base/memory/ directory. TBR=ben@chromium.org,brettw@chromium.org Review URL: https://chromiumcodereview.appspot.com/13428002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191789 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gl')
-rw-r--r--ui/gl/async_pixel_transfer_delegate_android.cc2
-rw-r--r--ui/gl/async_pixel_transfer_delegate_idle.cc2
-rw-r--r--ui/gl/async_pixel_transfer_delegate_stub.cc2
-rw-r--r--ui/gl/safe_shared_memory_pool.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/ui/gl/async_pixel_transfer_delegate_android.cc b/ui/gl/async_pixel_transfer_delegate_android.cc
index 31f90bc..2414472 100644
--- a/ui/gl/async_pixel_transfer_delegate_android.cc
+++ b/ui/gl/async_pixel_transfer_delegate_android.cc
@@ -12,8 +12,8 @@
#include "base/lazy_instance.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
+#include "base/memory/shared_memory.h"
#include "base/process_util.h"
-#include "base/shared_memory.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/thread.h"
#include "build/build_config.h"
diff --git a/ui/gl/async_pixel_transfer_delegate_idle.cc b/ui/gl/async_pixel_transfer_delegate_idle.cc
index fb5c05e..a47da8f 100644
--- a/ui/gl/async_pixel_transfer_delegate_idle.cc
+++ b/ui/gl/async_pixel_transfer_delegate_idle.cc
@@ -7,9 +7,9 @@
#include "base/bind.h"
#include "base/debug/trace_event.h"
#include "base/lazy_instance.h"
+#include "base/memory/shared_memory.h"
#include "base/message_loop.h"
#include "base/process_util.h"
-#include "base/shared_memory.h"
#include "build/build_config.h"
#include "ui/gl/gl_bindings.h"
#include "ui/gl/gl_context.h"
diff --git a/ui/gl/async_pixel_transfer_delegate_stub.cc b/ui/gl/async_pixel_transfer_delegate_stub.cc
index e3835a2..b085b1e 100644
--- a/ui/gl/async_pixel_transfer_delegate_stub.cc
+++ b/ui/gl/async_pixel_transfer_delegate_stub.cc
@@ -4,7 +4,7 @@
#include "ui/gl/async_pixel_transfer_delegate_stub.h"
-#include "base/shared_memory.h"
+#include "base/memory/shared_memory.h"
#include "build/build_config.h"
#include "ui/gl/gl_bindings.h"
diff --git a/ui/gl/safe_shared_memory_pool.h b/ui/gl/safe_shared_memory_pool.h
index 9470cec3..d04f98c 100644
--- a/ui/gl/safe_shared_memory_pool.h
+++ b/ui/gl/safe_shared_memory_pool.h
@@ -8,7 +8,7 @@
#include <map>
#include "base/basictypes.h"
-#include "base/shared_memory.h"
+#include "base/memory/shared_memory.h"
#include "base/synchronization/lock.h"
#include "build/build_config.h"