mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix devtools_manager_delegate.cc

Browse source
This commit is contained in:
Cheng Zhao 2015-03-08 19:07:53 -07:00
parent c0356f0269
commit 8467fee8d8
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
brightray/browser/devtools_manager_delegate.cc
View file

@ -24,6 +24,7 @@
#include "content/public/common/url_constants.h" #include "content/public/common/url_constants.h"
#include "content/public/common/user_agent.h" #include "content/public/common/user_agent.h"
#include "net/socket/tcp_server_socket.h" #include "net/socket/tcp_server_socket.h"
#include "net/socket/stream_socket.h"
#include "ui/base/resource/resource_bundle.h" #include "ui/base/resource/resource_bundle.h"
using content::DevToolsAgentHost; using content::DevToolsAgentHost;
@ -65,7 +66,7 @@ class TCPServerSocketFactory
scoped_ptr<content::DevToolsHttpHandler::ServerSocketFactory> scoped_ptr<content::DevToolsHttpHandler::ServerSocketFactory>
CreateSocketFactory() { CreateSocketFactory() {
const CommandLine& command_line = *CommandLine::ForCurrentProcess(); auto& command_line = *base::CommandLine::ForCurrentProcess();
// See if the user specified a port on the command line (useful for // See if the user specified a port on the command line (useful for
// automation). If not, use an ephemeral port by specifying 0. // automation). If not, use an ephemeral port by specifying 0.
int port = 0; int port = 0;
@ -151,8 +152,7 @@ class DevToolsDelegate : public content::DevToolsHttpHandlerDelegate {
std::string GetDiscoveryPageHTML() override; std::string GetDiscoveryPageHTML() override;
bool BundlesFrontendResources() override; bool BundlesFrontendResources() override;
base::FilePath GetDebugFrontendDir() override; base::FilePath GetDebugFrontendDir() override;
scoped_ptr<net::StreamListenSocket> CreateSocketForTethering( scoped_ptr<net::ServerSocket> CreateSocketForTethering(
net::StreamListenSocket::Delegate* delegate,
std::string* name) override; std::string* name) override;
private: private:
@ -178,11 +178,9 @@ base::FilePath DevToolsDelegate::GetDebugFrontendDir() {
return base::FilePath(); return base::FilePath();
} }
scoped_ptr<net::StreamListenSocket> scoped_ptr<net::ServerSocket> DevToolsDelegate::CreateSocketForTethering(
DevToolsDelegate::CreateSocketForTethering(
net::StreamListenSocket::Delegate* delegate,
std::string* name) { std::string* name) {
return scoped_ptr<net::StreamListenSocket>(); return scoped_ptr<net::ServerSocket>();
} }
} // namespace } // namespace