| Index: content/browser/gpu/gpu_process_host_ui_shim.h
|
| diff --git a/content/browser/gpu/gpu_process_host_ui_shim.h b/content/browser/gpu/gpu_process_host_ui_shim.h
|
| index 9f4329a10a5898418a502e13b544af7fe572e8cb..7c5f60ab09f444dc00b5b31a40e9fa013410f07d 100644
|
| --- a/content/browser/gpu/gpu_process_host_ui_shim.h
|
| +++ b/content/browser/gpu/gpu_process_host_ui_shim.h
|
| @@ -16,9 +16,11 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/linked_ptr.h"
|
| #include "base/memory/ref_counted.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "base/threading/non_thread_safe.h"
|
| #include "content/common/content_export.h"
|
| #include "content/common/message_router.h"
|
| +#include "content/common/power_monitor_message_broadcaster.h"
|
| #include "content/public/common/gpu_memory_stats.h"
|
| #include "gpu/config/gpu_info.h"
|
| #include "ipc/ipc_listener.h"
|
| @@ -49,7 +51,7 @@ class GpuProcessHostUIShim : public IPC::Listener,
|
| public:
|
| // Create a GpuProcessHostUIShim with the given ID. The object can be found
|
| // using FromID with the same id.
|
| - static GpuProcessHostUIShim* Create(int host_id);
|
| + static GpuProcessHostUIShim* Create(int host_id, bool single_process);
|
|
|
| // Destroy the GpuProcessHostUIShim with the given host ID. This can only
|
| // be called on the UI thread. Only the GpuProcessHost should destroy the
|
| @@ -79,7 +81,7 @@ class GpuProcessHostUIShim : public IPC::Listener,
|
| CONTENT_EXPORT void SimulateHang();
|
|
|
| private:
|
| - explicit GpuProcessHostUIShim(int host_id);
|
| + GpuProcessHostUIShim(int host_id, bool single_process);
|
| virtual ~GpuProcessHostUIShim();
|
|
|
| // Message handlers.
|
| @@ -111,6 +113,8 @@ class GpuProcessHostUIShim : public IPC::Listener,
|
|
|
| // The serial number of the GpuProcessHost / GpuProcessHostUIShim pair.
|
| int host_id_;
|
| +
|
| + scoped_ptr<PowerMonitorMessageBroadcaster> power_monitor_broadcaster_;
|
| };
|
|
|
| } // namespace content
|
|
|