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

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

Issue 560323005: [DevTools] Move target-related methods from DevToolsHttpHandlerDelegate to DevToolsManagerDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_DEVTOOLS_HTTP_HANDLER_IMPL_H_ 5 #ifndef CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_HTTP_HANDLER_IMPL_H_
6 #define CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_HTTP_HANDLER_IMPL_H_ 6 #define CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_HTTP_HANDLER_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "content/common/content_export.h" 15 #include "content/common/content_export.h"
16 #include "content/public/browser/devtools_agent_host.h" 16 #include "content/public/browser/devtools_agent_host.h"
17 #include "content/public/browser/devtools_http_handler.h" 17 #include "content/public/browser/devtools_http_handler.h"
18 #include "content/public/browser/devtools_http_handler_delegate.h" 18 #include "content/public/browser/devtools_http_handler_delegate.h"
19 #include "content/public/browser/devtools_manager_delegate.h"
19 #include "net/http/http_status_code.h" 20 #include "net/http/http_status_code.h"
20 #include "net/server/http_server.h" 21 #include "net/server/http_server.h"
21 22
22 namespace base { 23 namespace base {
23 class DictionaryValue; 24 class DictionaryValue;
24 class ListValue; 25 class ListValue;
25 class Thread; 26 class Thread;
26 class Value; 27 class Value;
27 } 28 }
28 29
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 const net::HttpServerRequestInfo& info); 74 const net::HttpServerRequestInfo& info);
74 void OnWebSocketMessageUI(int connection_id, const std::string& data); 75 void OnWebSocketMessageUI(int connection_id, const std::string& data);
75 void OnCloseUI(int connection_id); 76 void OnCloseUI(int connection_id);
76 77
77 void ResetHandlerThread(); 78 void ResetHandlerThread();
78 void ResetHandlerThreadAndRelease(); 79 void ResetHandlerThreadAndRelease();
79 80
80 void OnTargetListReceived( 81 void OnTargetListReceived(
81 int connection_id, 82 int connection_id,
82 const std::string& host, 83 const std::string& host,
83 const DevToolsHttpHandlerDelegate::TargetList& targets); 84 const DevToolsManagerDelegate::TargetList& targets);
84 85
85 DevToolsTarget* GetTarget(const std::string& id); 86 DevToolsTarget* GetTarget(const std::string& id);
86 87
87 void Init(); 88 void Init();
88 void Teardown(); 89 void Teardown();
89 90
90 void StartHandlerThread(); 91 void StartHandlerThread();
91 void StopHandlerThread(); 92 void StopHandlerThread();
92 void StopWithoutRelease(); 93 void StopWithoutRelease();
93 94
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 typedef std::map<std::string, DevToolsTarget*> TargetMap; 127 typedef std::map<std::string, DevToolsTarget*> TargetMap;
127 TargetMap target_map_; 128 TargetMap target_map_;
128 typedef std::map<int, scoped_refptr<DevToolsBrowserTarget> > BrowserTargets; 129 typedef std::map<int, scoped_refptr<DevToolsBrowserTarget> > BrowserTargets;
129 BrowserTargets browser_targets_; 130 BrowserTargets browser_targets_;
130 DISALLOW_COPY_AND_ASSIGN(DevToolsHttpHandlerImpl); 131 DISALLOW_COPY_AND_ASSIGN(DevToolsHttpHandlerImpl);
131 }; 132 };
132 133
133 } // namespace content 134 } // namespace content
134 135
135 #endif // CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_HTTP_HANDLER_IMPL_H_ 136 #endif // CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_HTTP_HANDLER_IMPL_H_
OLDNEW
« no previous file with comments | « chromecast/shell/browser/devtools/cast_dev_tools_delegate.cc ('k') | content/browser/devtools/devtools_http_handler_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698