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

Fix API changes

Browse source
This commit is contained in:
Cheng Zhao 2015-04-21 18:54:57 +08:00
parent 80dd72b93c
commit 90b255f2cd
6 changed files with 40 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

28
brightray/browser/devtools_manager_delegate.cc
View file

@ -50,17 +50,24 @@ const char kTargetTypeOther[] = "other";
class TCPServerSocketFactory
: public content::DevToolsHttpHandler::ServerSocketFactory {
public:
TCPServerSocketFactory(const std::string& address, int port, int backlog)
: content::DevToolsHttpHandler::ServerSocketFactory(
address, port, backlog) {}
TCPServerSocketFactory(const std::string& address, int port)
: address_(address), port_(port) {
}
private:
// content::DevToolsHttpHandler::ServerSocketFactory.
scoped_ptr<net::ServerSocket> Create() const override {
return scoped_ptr<net::ServerSocket>(
new net::TCPServerSocket(NULL, net::NetLog::Source()));
scoped_ptr<net::ServerSocket> CreateForHttpServer() override {
scoped_ptr<net::ServerSocket> socket(
new net::TCPServerSocket(nullptr, net::NetLog::Source()));
if (socket->ListenWithAddressAndPort(address_, port_, 10) != net::OK)
return scoped_ptr<net::ServerSocket>();
return socket;
}
std::string address_;
uint16 port_;
DISALLOW_COPY_AND_ASSIGN(TCPServerSocketFactory);
};
@ -82,7 +89,7 @@ CreateSocketFactory() {
}
}
return scoped_ptr<content::DevToolsHttpHandler::ServerSocketFactory>(
new TCPServerSocketFactory("127.0.0.1", port, 1));
new TCPServerSocketFactory("127.0.0.1", port));
}
class Target : public content::DevToolsTarget {
@ -152,8 +159,6 @@ class DevToolsDelegate : public content::DevToolsHttpHandlerDelegate {
std::string GetDiscoveryPageHTML() override;
bool BundlesFrontendResources() override;
base::FilePath GetDebugFrontendDir() override;
scoped_ptr<net::ServerSocket> CreateSocketForTethering(
std::string* name) override;
private:
DISALLOW_COPY_AND_ASSIGN(DevToolsDelegate);
@ -178,11 +183,6 @@ base::FilePath DevToolsDelegate::GetDebugFrontendDir() {
return base::FilePath();
}
scoped_ptr<net::ServerSocket> DevToolsDelegate::CreateSocketForTethering(
std::string* name) {
return scoped_ptr<net::ServerSocket>();
}
} // namespace
// DevToolsManagerDelegate ---------------------------------------------------