| Index: content/browser/devtools/embedded_worker_devtools_manager.h
|
| diff --git a/content/browser/devtools/shared_worker_devtools_manager.h b/content/browser/devtools/embedded_worker_devtools_manager.h
|
| similarity index 57%
|
| rename from content/browser/devtools/shared_worker_devtools_manager.h
|
| rename to content/browser/devtools/embedded_worker_devtools_manager.h
|
| index 4b238211d1df3f9fd3815a8451ce5601f15f14ee..8a07e5bc1326eb3303d263a4907ef2b27b915fcb 100644
|
| --- a/content/browser/devtools/shared_worker_devtools_manager.h
|
| +++ b/content/browser/devtools/embedded_worker_devtools_manager.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CONTENT_BROWSER_DEVTOOLS_SHARED_WORKER_DEVTOOLS_MANAGER_H_
|
| -#define CONTENT_BROWSER_DEVTOOLS_SHARED_WORKER_DEVTOOLS_MANAGER_H_
|
| +#ifndef CONTENT_BROWSER_DEVTOOLS_EMBEDDED_WORKER_DEVTOOLS_MANAGER_H_
|
| +#define CONTENT_BROWSER_DEVTOOLS_EMBEDDED_WORKER_DEVTOOLS_MANAGER_H_
|
|
|
| #include "base/basictypes.h"
|
| #include "base/containers/scoped_ptr_hash_map.h"
|
| @@ -19,32 +19,32 @@ class GURL;
|
| namespace content {
|
| class DevToolsAgentHost;
|
|
|
| -// SharedWorkerDevToolsManager is used instead of WorkerDevToolsManager when
|
| +// EmbeddedWorkerDevToolsManager is used instead of WorkerDevToolsManager when
|
| // "enable-embedded-shared-worker" flag is set.
|
| // This class lives on UI thread.
|
| -class CONTENT_EXPORT SharedWorkerDevToolsManager {
|
| +class CONTENT_EXPORT EmbeddedWorkerDevToolsManager {
|
| public:
|
| typedef std::pair<int, int> WorkerId;
|
| - class SharedWorkerDevToolsAgentHost;
|
| + class EmbeddedWorkerDevToolsAgentHost;
|
|
|
| - // Returns the SharedWorkerDevToolsManager singleton.
|
| - static SharedWorkerDevToolsManager* GetInstance();
|
| + // Returns the EmbeddedWorkerDevToolsManager singleton.
|
| + static EmbeddedWorkerDevToolsManager* GetInstance();
|
|
|
| DevToolsAgentHost* GetDevToolsAgentHostForWorker(int worker_process_id,
|
| int worker_route_id);
|
|
|
| // Returns true when the worker must be paused on start.
|
| - bool WorkerCreated(int worker_process_id,
|
| - int worker_route_id,
|
| - const SharedWorkerInstance& instance);
|
| + bool SharedWorkerCreated(int worker_process_id,
|
| + int worker_route_id,
|
| + const SharedWorkerInstance& instance);
|
| void WorkerDestroyed(int worker_process_id, int worker_route_id);
|
| void WorkerContextStarted(int worker_process_id, int worker_route_id);
|
|
|
| private:
|
| - friend struct DefaultSingletonTraits<SharedWorkerDevToolsManager>;
|
| - friend class SharedWorkerDevToolsManagerTest;
|
| - FRIEND_TEST_ALL_PREFIXES(SharedWorkerDevToolsManagerTest, BasicTest);
|
| - FRIEND_TEST_ALL_PREFIXES(SharedWorkerDevToolsManagerTest, AttachTest);
|
| + friend struct DefaultSingletonTraits<EmbeddedWorkerDevToolsManager>;
|
| + friend class EmbeddedWorkerDevToolsManagerTest;
|
| + FRIEND_TEST_ALL_PREFIXES(EmbeddedWorkerDevToolsManagerTest, BasicTest);
|
| + FRIEND_TEST_ALL_PREFIXES(EmbeddedWorkerDevToolsManagerTest, AttachTest);
|
|
|
| enum WorkerState {
|
| WORKER_UNINSPECTED,
|
| @@ -61,25 +61,25 @@ class CONTENT_EXPORT SharedWorkerDevToolsManager {
|
| const SharedWorkerInstance& instance() const { return instance_; }
|
| WorkerState state() { return state_; }
|
| void set_state(WorkerState new_state) { state_ = new_state; }
|
| - SharedWorkerDevToolsAgentHost* agent_host() { return agent_host_; }
|
| - void set_agent_host(SharedWorkerDevToolsAgentHost* agent_host) {
|
| + EmbeddedWorkerDevToolsAgentHost* agent_host() { return agent_host_; }
|
| + void set_agent_host(EmbeddedWorkerDevToolsAgentHost* agent_host) {
|
| agent_host_ = agent_host;
|
| }
|
|
|
| private:
|
| const SharedWorkerInstance instance_;
|
| WorkerState state_;
|
| - SharedWorkerDevToolsAgentHost* agent_host_;
|
| + EmbeddedWorkerDevToolsAgentHost* agent_host_;
|
| };
|
|
|
| typedef base::ScopedPtrHashMap<WorkerId, WorkerInfo> WorkerInfoMap;
|
|
|
| - SharedWorkerDevToolsManager();
|
| - virtual ~SharedWorkerDevToolsManager();
|
| + EmbeddedWorkerDevToolsManager();
|
| + virtual ~EmbeddedWorkerDevToolsManager();
|
|
|
| - void RemoveInspectedWorkerData(SharedWorkerDevToolsAgentHost* agent_host);
|
| + void RemoveInspectedWorkerData(EmbeddedWorkerDevToolsAgentHost* agent_host);
|
|
|
| - WorkerInfoMap::iterator FindExistingWorkerInfo(
|
| + WorkerInfoMap::iterator FindExistingSharedWorkerInfo(
|
| const SharedWorkerInstance& instance);
|
|
|
| // Resets to its initial state as if newly created.
|
| @@ -87,9 +87,9 @@ class CONTENT_EXPORT SharedWorkerDevToolsManager {
|
|
|
| WorkerInfoMap workers_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(SharedWorkerDevToolsManager);
|
| + DISALLOW_COPY_AND_ASSIGN(EmbeddedWorkerDevToolsManager);
|
| };
|
|
|
| } // namespace content
|
|
|
| -#endif // CONTENT_BROWSER_DEVTOOLS_SHARED_WORKER_DEVTOOLS_MANAGER_H_
|
| +#endif // CONTENT_BROWSER_DEVTOOLS_EMBEDDED_WORKER_DEVTOOLS_MANAGER_H_
|
|
|