Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(408)

Unified Diff: content/common/gpu/gpu_channel.h

Issue 11227033: Move a bunch of code in content\common (as well as a few left in renderer) to the content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix cros Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/common/gpu/gpu_channel.h
===================================================================
--- content/common/gpu/gpu_channel.h (revision 163290)
+++ content/common/gpu/gpu_channel.h (working copy)
@@ -28,9 +28,7 @@
#include "content/common/android/surface_texture_peer.h"
#endif
-class GpuChannelManager;
struct GPUCreateCommandBufferConfig;
-class GpuWatchdog;
namespace base {
class MessageLoopProxy;
@@ -50,6 +48,10 @@
}
#endif
+namespace content {
+class GpuChannelManager;
+class GpuWatchdog;
+
// Encapsulates an IPC channel between the GPU process and one renderer
// process. On the renderer side there's a corresponding GpuChannelHost.
class GpuChannel : public IPC::Listener,
@@ -135,7 +137,7 @@
scoped_refptr<gpu::RefCountedCounter> preempt_by_counter);
#if defined(OS_ANDROID)
- content::StreamTextureManagerAndroid* stream_texture_manager() {
+ StreamTextureManagerAndroid* stream_texture_manager() {
return stream_texture_manager_.get();
}
#endif
@@ -168,7 +170,7 @@
// Create a java surface texture object and send it to the renderer process
// through binder thread.
void OnEstablishStreamTexture(
- int32 stream_id, content::SurfaceTexturePeer::SurfaceTextureTarget type,
+ int32 stream_id, SurfaceTexturePeer::SurfaceTextureTarget type,
int32 primary_id, int32 secondary_id);
#endif
@@ -222,7 +224,7 @@
bool processed_get_state_fast_;
#if defined(OS_ANDROID)
- scoped_ptr<content::StreamTextureManagerAndroid> stream_texture_manager_;
+ scoped_ptr<StreamTextureManagerAndroid> stream_texture_manager_;
#endif
base::WeakPtrFactory<GpuChannel> weak_factory_;
@@ -230,4 +232,6 @@
DISALLOW_COPY_AND_ASSIGN(GpuChannel);
};
+} // namespace content
+
#endif // CONTENT_COMMON_GPU_GPU_CHANNEL_H_
« no previous file with comments | « content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc ('k') | content/common/gpu/gpu_channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698