| Index: content/browser/debugger/worker_devtools_manager.h
|
| ===================================================================
|
| --- content/browser/debugger/worker_devtools_manager.h (revision 119868)
|
| +++ content/browser/debugger/worker_devtools_manager.h (working copy)
|
| @@ -14,18 +14,14 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/singleton.h"
|
| #include "content/common/content_export.h"
|
| -#include "content/public/browser/worker_service_observer.h"
|
| +#include "content/browser/worker_host/worker_process_host.h"
|
|
|
| -namespace IPC {
|
| -class Message;
|
| -}
|
| -
|
| namespace content {
|
|
|
| class DevToolsAgentHost;
|
|
|
| // All methods are supposed to be called on the IO thread.
|
| -class WorkerDevToolsManager : private WorkerServiceObserver {
|
| +class WorkerDevToolsManager {
|
| public:
|
| // Returns the WorkerDevToolsManager singleton.
|
| static WorkerDevToolsManager* GetInstance();
|
| @@ -42,6 +38,13 @@
|
| int worker_route_id,
|
| const std::string& state);
|
|
|
| + // Called on the IO thread.
|
| + void WorkerCreated(
|
| + WorkerProcessHost* process,
|
| + const WorkerProcessHost::WorkerInstance& instance);
|
| + void WorkerDestroyed(WorkerProcessHost* process, int worker_route_id);
|
| + void WorkerContextStarted(WorkerProcessHost* process, int worker_route_id);
|
| +
|
| private:
|
| friend struct DefaultSingletonTraits<WorkerDevToolsManager>;
|
| typedef std::pair<int, int> WorkerId;
|
| @@ -54,16 +57,6 @@
|
| WorkerDevToolsManager();
|
| virtual ~WorkerDevToolsManager();
|
|
|
| - // WorkerServiceObserver implementation.
|
| - virtual void WorkerCreated(
|
| - WorkerProcessHost* process,
|
| - const WorkerProcessHost::WorkerInstance& instance) OVERRIDE;
|
| - virtual void WorkerDestroyed(
|
| - WorkerProcessHost* process,
|
| - int worker_route_id) OVERRIDE;
|
| - virtual void WorkerContextStarted(WorkerProcessHost* process,
|
| - int worker_route_id) OVERRIDE;
|
| -
|
| void RemoveInspectedWorkerData(const WorkerId& id);
|
| InspectedWorkersList::iterator FindInspectedWorker(int host_id, int route_id);
|
|
|
|
|