summaryrefslogtreecommitdiffstats
path: root/chrome/gpu/gpu_thread.h
diff options
context:
space:
mode:
authorkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-06 23:25:50 +0000
committerkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-06 23:25:50 +0000
commita363c7abfdc3e6562ae7f4fe338f585192f347b4 (patch)
tree9bc04bbc6a7ac5c39946820e470f3fb00873afec /chrome/gpu/gpu_thread.h
parent35312bf28d33672dbb69afe28dd82c92411ef100 (diff)
downloadchromium_src-a363c7abfdc3e6562ae7f4fe338f585192f347b4.zip
chromium_src-a363c7abfdc3e6562ae7f4fe338f585192f347b4.tar.gz
chromium_src-a363c7abfdc3e6562ae7f4fe338f585192f347b4.tar.bz2
Revert http://codereview.chromium.org/6094009 (r70768) due to
compilation error on Mac OS X. BUG=65369 TBR=apatrick TEST=none Review URL: http://codereview.chromium.org/6150001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70681 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/gpu/gpu_thread.h')
-rw-r--r--chrome/gpu/gpu_thread.h11
1 files changed, 1 insertions, 10 deletions
diff --git a/chrome/gpu/gpu_thread.h b/chrome/gpu/gpu_thread.h
index 1d0f434..07302d3 100644
--- a/chrome/gpu/gpu_thread.h
+++ b/chrome/gpu/gpu_thread.h
@@ -7,7 +7,6 @@
#pragma once
#include "base/basictypes.h"
-#include "base/command_line.h"
#include "base/scoped_ptr.h"
#include "base/time.h"
#include "build/build_config.h"
@@ -22,15 +21,12 @@ namespace IPC {
struct ChannelHandle;
}
-class GpuWatchdogThread;
-
class GpuThread : public ChildThread {
public:
- explicit GpuThread(const CommandLine& command_line);
+ GpuThread();
~GpuThread();
void Init(const base::Time& process_start_time);
- void StopWatchdog();
// Remove the channel for a particular renderer.
void RemoveChannel(int renderer_id);
@@ -40,7 +36,6 @@ class GpuThread : public ChildThread {
virtual bool OnControlMessageReceived(const IPC::Message& msg);
// Message handlers.
- void OnInitialize();
void OnEstablishChannel(int renderer_id);
void OnCloseChannel(const IPC::ChannelHandle& channel_handle);
void OnSynchronize();
@@ -58,10 +53,6 @@ class GpuThread : public ChildThread {
static void SetDxDiagnostics(GpuThread* thread, const DxDiagNode& node);
#endif
- CommandLine command_line_;
- base::Time process_start_time_;
- scoped_refptr<GpuWatchdogThread> watchdog_thread_;
-
typedef base::hash_map<int, scoped_refptr<GpuChannel> > GpuChannelMap;
GpuChannelMap gpu_channels_;