| Index: content/browser/android/in_process_surface_texture_manager.h
|
| diff --git a/content/browser/android/in_process_surface_texture_manager.h b/content/browser/android/in_process_surface_texture_manager.h
|
| index 24e951c7b2fee7200a365ee7c5e29613cca2dc7e..15aabd2526bdcad091b1d27e5569ac1ec7506915 100644
|
| --- a/content/browser/android/in_process_surface_texture_manager.h
|
| +++ b/content/browser/android/in_process_surface_texture_manager.h
|
| @@ -5,22 +5,22 @@
|
| #ifndef CONTENT_BROWSER_ANDROID_IN_PROCESS_SURFACE_TEXTURE_MANAGER_H_
|
| #define CONTENT_BROWSER_ANDROID_IN_PROCESS_SURFACE_TEXTURE_MANAGER_H_
|
|
|
| -#include "content/common/android/surface_texture_manager.h"
|
| +#include "gpu/ipc/common/surface_texture_manager.h"
|
|
|
| #include "base/containers/scoped_ptr_hash_map.h"
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/singleton.h"
|
| #include "base/synchronization/lock.h"
|
| -#include "content/common/android/surface_texture_peer.h"
|
| #include "content/common/content_export.h"
|
| +#include "gpu/ipc/common/surface_texture_peer.h"
|
| #include "ui/gl/android/scoped_java_surface.h"
|
|
|
| namespace content {
|
|
|
| class CONTENT_EXPORT InProcessSurfaceTextureManager
|
| - : public SurfaceTextureManager,
|
| - public SurfaceTexturePeer {
|
| + : public gpu::SurfaceTextureManager,
|
| + public gpu::SurfaceTexturePeer {
|
| public:
|
| static InProcessSurfaceTextureManager* GetInstance();
|
|
|
|
|