diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 23:56:55 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 23:56:55 +0000 |
| commit | a80f5ece3d46eeb0734cfca6c716d69e7ab7aaa2 (patch) | |
| tree | e1b989fd7c67f745061a481692671b1331cffe02 /content/gpu/gpu_child_thread.h | |
| parent | 56cbcc3ce45c1b68f9fbdbed6244bebe1f203403 (diff) | |
| download | chromium_src-a80f5ece3d46eeb0734cfca6c716d69e7ab7aaa2.zip chromium_src-a80f5ece3d46eeb0734cfca6c716d69e7ab7aaa2.tar.gz chromium_src-a80f5ece3d46eeb0734cfca6c716d69e7ab7aaa2.tar.bz2 | |
Move GPUInfo to content/public/common and put it into the content namespace.
BUG=98716
Review URL: http://codereview.chromium.org/8363007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106637 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/gpu/gpu_child_thread.h')
| -rw-r--r-- | content/gpu/gpu_child_thread.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/content/gpu/gpu_child_thread.h b/content/gpu/gpu_child_thread.h index 06643dc..5409963 100644 --- a/content/gpu/gpu_child_thread.h +++ b/content/gpu/gpu_child_thread.h @@ -18,8 +18,8 @@ #include "content/common/gpu/gpu_channel.h" #include "content/common/gpu/gpu_channel_manager.h" #include "content/common/gpu/gpu_config.h" -#include "content/common/gpu/gpu_info.h" #include "content/common/gpu/x_util.h" +#include "content/public/common/gpu_info.h" #include "ui/gfx/native_widget_types.h" namespace IPC { @@ -62,7 +62,8 @@ class GpuChildThread : public ChildThread { #if defined(OS_WIN) static void CollectDxDiagnostics(GpuChildThread* thread); - static void SetDxDiagnostics(GpuChildThread* thread, const DxDiagNode& node); + static void SetDxDiagnostics(GpuChildThread* thread, + const content::DxDiagNode& node); #endif // Set this flag to true if a fatal error occurred before we receive the @@ -82,7 +83,7 @@ class GpuChildThread : public ChildThread { scoped_ptr<GpuChannelManager> gpu_channel_manager_; // Information about the GPU, such as device and vendor ID. - GPUInfo gpu_info_; + content::GPUInfo gpu_info_; DISALLOW_COPY_AND_ASSIGN(GpuChildThread); }; |