Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1086)

Side by Side Diff: content/browser/devtools/embedded_worker_devtools_manager.h

Issue 467653002: Revert of [DevTools] Make DevTools clients talk directly to DevToolsAgentHost instead of using DevToolsManage… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_DEVTOOLS_EMBEDDED_WORKER_DEVTOOLS_MANAGER_H_ 5 #ifndef CONTENT_BROWSER_DEVTOOLS_EMBEDDED_WORKER_DEVTOOLS_MANAGER_H_
6 #define CONTENT_BROWSER_DEVTOOLS_EMBEDDED_WORKER_DEVTOOLS_MANAGER_H_ 6 #define CONTENT_BROWSER_DEVTOOLS_EMBEDDED_WORKER_DEVTOOLS_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/gtest_prod_util.h" 11 #include "base/gtest_prod_util.h"
12 #include "base/memory/scoped_vector.h" 12 #include "base/memory/scoped_vector.h"
13 #include "base/memory/singleton.h" 13 #include "base/memory/singleton.h"
14 #include "base/strings/string16.h" 14 #include "base/strings/string16.h"
15 #include "content/browser/shared_worker/shared_worker_instance.h" 15 #include "content/browser/shared_worker/shared_worker_instance.h"
16 #include "content/common/content_export.h" 16 #include "content/common/content_export.h"
17 17
18 namespace content { 18 namespace content {
19 19
20 class DevToolsAgentHostImpl; 20 class DevToolsAgentHost;
21 class EmbeddedWorkerDevToolsAgentHost; 21 class EmbeddedWorkerDevToolsAgentHost;
22 class ServiceWorkerContextCore; 22 class ServiceWorkerContextCore;
23 23
24 // EmbeddedWorkerDevToolsManager is used instead of WorkerDevToolsManager when 24 // EmbeddedWorkerDevToolsManager is used instead of WorkerDevToolsManager when
25 // "enable-embedded-shared-worker" flag is set. 25 // "enable-embedded-shared-worker" flag is set.
26 // This class lives on UI thread. 26 // This class lives on UI thread.
27 class CONTENT_EXPORT EmbeddedWorkerDevToolsManager { 27 class CONTENT_EXPORT EmbeddedWorkerDevToolsManager {
28 public: 28 public:
29 typedef std::pair<int, int> WorkerId; 29 typedef std::pair<int, int> WorkerId;
30 30
31 class ServiceWorkerIdentifier { 31 class ServiceWorkerIdentifier {
32 public: 32 public:
33 ServiceWorkerIdentifier( 33 ServiceWorkerIdentifier(
34 const ServiceWorkerContextCore* const service_worker_context, 34 const ServiceWorkerContextCore* const service_worker_context,
35 int64 service_worker_version_id); 35 int64 service_worker_version_id);
36 explicit ServiceWorkerIdentifier(const ServiceWorkerIdentifier& other); 36 explicit ServiceWorkerIdentifier(const ServiceWorkerIdentifier& other);
37 ~ServiceWorkerIdentifier() {} 37 ~ServiceWorkerIdentifier() {}
38 38
39 bool Matches(const ServiceWorkerIdentifier& other) const; 39 bool Matches(const ServiceWorkerIdentifier& other) const;
40 40
41 private: 41 private:
42 const ServiceWorkerContextCore* const service_worker_context_; 42 const ServiceWorkerContextCore* const service_worker_context_;
43 const int64 service_worker_version_id_; 43 const int64 service_worker_version_id_;
44 }; 44 };
45 45
46 // Returns the EmbeddedWorkerDevToolsManager singleton. 46 // Returns the EmbeddedWorkerDevToolsManager singleton.
47 static EmbeddedWorkerDevToolsManager* GetInstance(); 47 static EmbeddedWorkerDevToolsManager* GetInstance();
48 48
49 DevToolsAgentHostImpl* GetDevToolsAgentHostForWorker(int worker_process_id, 49 DevToolsAgentHost* GetDevToolsAgentHostForWorker(int worker_process_id,
50 int worker_route_id); 50 int worker_route_id);
51 DevToolsAgentHostImpl* GetDevToolsAgentHostForServiceWorker( 51 DevToolsAgentHost* GetDevToolsAgentHostForServiceWorker(
52 const ServiceWorkerIdentifier& service_worker_id); 52 const ServiceWorkerIdentifier& service_worker_id);
53 53
54 // Returns true when the worker must be paused on start because a DevTool 54 // Returns true when the worker must be paused on start because a DevTool
55 // window for the same former SharedWorkerInstance is still opened. 55 // window for the same former SharedWorkerInstance is still opened.
56 bool SharedWorkerCreated(int worker_process_id, 56 bool SharedWorkerCreated(int worker_process_id,
57 int worker_route_id, 57 int worker_route_id,
58 const SharedWorkerInstance& instance); 58 const SharedWorkerInstance& instance);
59 // Returns true when the worker must be paused on start because a DevTool 59 // Returns true when the worker must be paused on start because a DevTool
60 // window for the same former ServiceWorkerIdentifier is still opened or 60 // window for the same former ServiceWorkerIdentifier is still opened or
61 // debug-on-start is enabled in chrome://serviceworker-internals. 61 // debug-on-start is enabled in chrome://serviceworker-internals.
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 AgentHostMap workers_; 99 AgentHostMap workers_;
100 100
101 bool debug_service_worker_on_start_; 101 bool debug_service_worker_on_start_;
102 102
103 DISALLOW_COPY_AND_ASSIGN(EmbeddedWorkerDevToolsManager); 103 DISALLOW_COPY_AND_ASSIGN(EmbeddedWorkerDevToolsManager);
104 }; 104 };
105 105
106 } // namespace content 106 } // namespace content
107 107
108 #endif // CONTENT_BROWSER_DEVTOOLS_EMBEDDED_WORKER_DEVTOOLS_MANAGER_H_ 108 #endif // CONTENT_BROWSER_DEVTOOLS_EMBEDDED_WORKER_DEVTOOLS_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698