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

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

Issue 666673007: [DevTools] Keep IP address of HttpServer as a member of DevToolsHttpHandlerImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added a lock for server_ip_address_. Created 6 years, 2 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 "base/synchronization/lock.h"
15 #include "content/common/content_export.h" 16 #include "content/common/content_export.h"
16 #include "content/public/browser/devtools_agent_host.h" 17 #include "content/public/browser/devtools_agent_host.h"
17 #include "content/public/browser/devtools_http_handler.h" 18 #include "content/public/browser/devtools_http_handler.h"
18 #include "content/public/browser/devtools_http_handler_delegate.h" 19 #include "content/public/browser/devtools_http_handler_delegate.h"
19 #include "content/public/browser/devtools_manager_delegate.h" 20 #include "content/public/browser/devtools_manager_delegate.h"
20 #include "net/http/http_status_code.h" 21 #include "net/http/http_status_code.h"
21 #include "net/server/http_server.h" 22 #include "net/server/http_server.h"
22 23
23 namespace base { 24 namespace base {
24 class DictionaryValue; 25 class DictionaryValue;
25 class ListValue; 26 class ListValue;
26 class Thread; 27 class Thread;
27 class Value; 28 class Value;
28 } 29 }
29 30
30 namespace net { 31 namespace net {
32 class IPEndPoint;
31 class ServerSocketFactory; 33 class ServerSocketFactory;
32 class URLRequestContextGetter; 34 class URLRequestContextGetter;
33 } 35 }
34 36
35 namespace content { 37 namespace content {
36 38
37 class DevToolsHttpHandlerImpl 39 class DevToolsHttpHandlerImpl
38 : public DevToolsHttpHandler, 40 : public DevToolsHttpHandler,
39 public base::RefCountedThreadSafe<DevToolsHttpHandlerImpl>, 41 public base::RefCountedThreadSafe<DevToolsHttpHandlerImpl>,
40 public net::HttpServer::Delegate { 42 public net::HttpServer::Delegate {
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 114
113 base::DictionaryValue* SerializeTarget(const DevToolsTarget& target, 115 base::DictionaryValue* SerializeTarget(const DevToolsTarget& target,
114 const std::string& host); 116 const std::string& host);
115 117
116 // The thread used by the devtools handler to run server socket. 118 // The thread used by the devtools handler to run server socket.
117 scoped_ptr<base::Thread> thread_; 119 scoped_ptr<base::Thread> thread_;
118 120
119 std::string frontend_url_; 121 std::string frontend_url_;
120 const scoped_ptr<ServerSocketFactory> server_socket_factory_; 122 const scoped_ptr<ServerSocketFactory> server_socket_factory_;
121 scoped_ptr<net::HttpServer> server_; 123 scoped_ptr<net::HttpServer> server_;
124 scoped_ptr<net::IPEndPoint> server_ip_address_;
125 base::Lock server_ip_address_lock_;
122 typedef std::map<int, DevToolsAgentHostClient*> ConnectionToClientMap; 126 typedef std::map<int, DevToolsAgentHostClient*> ConnectionToClientMap;
123 ConnectionToClientMap connection_to_client_ui_; 127 ConnectionToClientMap connection_to_client_ui_;
124 const scoped_ptr<DevToolsHttpHandlerDelegate> delegate_; 128 const scoped_ptr<DevToolsHttpHandlerDelegate> delegate_;
125 const base::FilePath active_port_output_directory_; 129 const base::FilePath active_port_output_directory_;
126 typedef std::map<std::string, DevToolsTarget*> TargetMap; 130 typedef std::map<std::string, DevToolsTarget*> TargetMap;
127 TargetMap target_map_; 131 TargetMap target_map_;
128 typedef std::map<int, BrowserTarget*> BrowserTargets; 132 typedef std::map<int, BrowserTarget*> BrowserTargets;
129 BrowserTargets browser_targets_; 133 BrowserTargets browser_targets_;
130 DISALLOW_COPY_AND_ASSIGN(DevToolsHttpHandlerImpl); 134 DISALLOW_COPY_AND_ASSIGN(DevToolsHttpHandlerImpl);
131 }; 135 };
132 136
133 } // namespace content 137 } // namespace content
134 138
135 #endif // CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_HTTP_HANDLER_IMPL_H_ 139 #endif // CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_HTTP_HANDLER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698