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

Side by Side Diff: content/browser/devtools/protocol/browser_handler.h

Issue 2344753002: DevTools: return discovered targets asynchronously. (Closed)
Patch Set: for bots 2 Created 4 years, 3 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_PROTOCOL_BROWSER_HANDLER_H_ 5 #ifndef CONTENT_BROWSER_DEVTOOLS_PROTOCOL_BROWSER_HANDLER_H_
6 #define CONTENT_BROWSER_DEVTOOLS_PROTOCOL_BROWSER_HANDLER_H_ 6 #define CONTENT_BROWSER_DEVTOOLS_PROTOCOL_BROWSER_HANDLER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/memory/weak_ptr.h"
10 #include "content/browser/devtools/protocol/devtools_protocol_dispatcher.h" 11 #include "content/browser/devtools/protocol/devtools_protocol_dispatcher.h"
11 #include "content/public/browser/devtools_agent_host.h" 12 #include "content/public/browser/devtools_agent_host.h"
12 13
13 namespace net { 14 namespace net {
14 class ServerSocket; 15 class ServerSocket;
15 } 16 }
16 17
17 // Windows headers will redefine SendMessage. 18 // Windows headers will redefine SendMessage.
18 #ifdef SendMessage 19 #ifdef SendMessage
19 #undef SendMessage 20 #undef SendMessage
20 #endif 21 #endif
21 22
22 namespace content { 23 namespace content {
23 namespace devtools { 24 namespace devtools {
24 namespace browser { 25 namespace browser {
25 26
26 class BrowserHandler : public DevToolsAgentHostClient { 27 class BrowserHandler : public DevToolsAgentHostClient {
27 public: 28 public:
28 using Response = DevToolsProtocolClient::Response; 29 using Response = DevToolsProtocolClient::Response;
29 30
30 BrowserHandler(); 31 BrowserHandler();
31 ~BrowserHandler() override; 32 ~BrowserHandler() override;
32 33
33 void SetClient(std::unique_ptr<Client> client); 34 void SetClient(std::unique_ptr<Client> client);
34 35
35 using TargetInfos = std::vector<scoped_refptr<devtools::browser::TargetInfo>>; 36 using TargetInfos = std::vector<scoped_refptr<devtools::browser::TargetInfo>>;
dgozman 2016/09/15 03:25:11 Let's remove this one.
36 37
37 Response CreateBrowserContext(std::string* out_context_id); 38 Response CreateBrowserContext(std::string* out_context_id);
38 Response DisposeBrowserContext(const std::string& context_id, 39 Response DisposeBrowserContext(const std::string& context_id,
39 bool* out_success); 40 bool* out_success);
40 Response CreateTarget(const std::string& url, 41 Response CreateTarget(const std::string& url,
41 const int* width, 42 const int* width,
42 const int* height, 43 const int* height,
43 const std::string* context_id, 44 const std::string* context_id,
44 std::string* out_targetId); 45 std::string* out_targetId);
45 Response CloseTarget(const std::string& targetId, bool* out_success); 46 Response CloseTarget(const std::string& targetId, bool* out_success);
46 Response GetTargets(TargetInfos* infos); 47 Response GetTargets(DevToolsCommandId command_id);
47 Response Attach(const std::string& targetId); 48 Response Attach(DevToolsCommandId command_id,
49 const std::string& targetId);
dgozman 2016/09/15 03:25:10 target_id everywhere
48 Response Detach(const std::string& targetId); 50 Response Detach(const std::string& targetId);
49 Response SendMessage(const std::string& targetId, const std::string& message); 51 Response SendMessage(const std::string& targetId, const std::string& message);
50 52
51 private: 53 private:
52 void DispatchProtocolMessage(DevToolsAgentHost* agent_host, 54 void DispatchProtocolMessage(DevToolsAgentHost* agent_host,
53 const std::string& message) override; 55 const std::string& message) override;
54 56
55 void AgentHostClosed(DevToolsAgentHost* agent_host, 57 void AgentHostClosed(DevToolsAgentHost* agent_host,
56 bool replaced_with_another_client) override; 58 bool replaced_with_another_client) override;
57 59
60 void RespondToGetTargets(DevToolsCommandId command_id,
61 DevToolsAgentHost::List list);
62 void RespondToAttach(DevToolsCommandId command_id,
63 const std::string& targetId,
64 DevToolsAgentHost::List agents);
65
58 std::unique_ptr<Client> client_; 66 std::unique_ptr<Client> client_;
67 DevToolsAgentHost::List attached_hosts_;
68 base::WeakPtrFactory<BrowserHandler> weak_factory_;
59 DISALLOW_COPY_AND_ASSIGN(BrowserHandler); 69 DISALLOW_COPY_AND_ASSIGN(BrowserHandler);
60 }; 70 };
61 71
62 } // namespace browser 72 } // namespace browser
63 } // namespace devtools 73 } // namespace devtools
64 } // namespace content 74 } // namespace content
65 75
66 #endif // CONTENT_BROWSER_DEVTOOLS_PROTOCOL_BROWSER_HANDLER_H_ 76 #endif // CONTENT_BROWSER_DEVTOOLS_PROTOCOL_BROWSER_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698