提交 6e9d6573 编写于 作者: E Eric Seidel

Correct InspectorFronend to InspectorFrontend

TBR=abarth@chromium.org

Review URL: https://codereview.chromium.org/697203007
上级 8b55ec0c
......@@ -12,27 +12,27 @@ namespace sky {
namespace inspector {
namespace {
const int kNotConnected = -1;
static base::LazyInstance<std::map<int, InspectorFronendImpl*>> g_servers =
static base::LazyInstance<std::map<int, InspectorFrontendImpl*>> g_servers =
LAZY_INSTANCE_INITIALIZER;
}
InspectorFronendImpl::InspectorFronendImpl()
InspectorFrontendImpl::InspectorFrontendImpl()
: connection_id_(kNotConnected) {
}
InspectorFronendImpl::~InspectorFronendImpl() {
InspectorFrontendImpl::~InspectorFrontendImpl() {
StopListening();
}
void InspectorFronendImpl::OnConnect(int connection_id) {
void InspectorFrontendImpl::OnConnect(int connection_id) {
}
void InspectorFronendImpl::OnHttpRequest(
void InspectorFrontendImpl::OnHttpRequest(
int connection_id, const net::HttpServerRequestInfo& info) {
web_server_->Send500(connection_id, "websockets protocol only");
}
void InspectorFronendImpl::OnWebSocketRequest(
void InspectorFrontendImpl::OnWebSocketRequest(
int connection_id, const net::HttpServerRequestInfo& info) {
if (connection_id_ != kNotConnected) {
web_server_->Close(connection_id);
......@@ -43,20 +43,20 @@ void InspectorFronendImpl::OnWebSocketRequest(
client()->OnConnect();
}
void InspectorFronendImpl::OnWebSocketMessage(
void InspectorFrontendImpl::OnWebSocketMessage(
int connection_id, const std::string& data) {
DCHECK_EQ(connection_id, connection_id_);
client()->OnMessage(data);
}
void InspectorFronendImpl::OnClose(int connection_id) {
void InspectorFrontendImpl::OnClose(int connection_id) {
if (connection_id != connection_id_)
return;
connection_id_ = kNotConnected;
client()->OnDisconnect();
}
void InspectorFronendImpl::Listen(int32_t port) {
void InspectorFrontendImpl::Listen(int32_t port) {
Register(port);
scoped_ptr<net::ServerSocket> server_socket(
new net::TCPServerSocket(NULL, net::NetLog::Source()));
......@@ -64,14 +64,14 @@ void InspectorFronendImpl::Listen(int32_t port) {
web_server_.reset(new net::HttpServer(server_socket.Pass(), this));
}
void InspectorFronendImpl::StopListening() {
void InspectorFrontendImpl::StopListening() {
if (!web_server_)
return;
web_server_.reset();
Unregister();
}
void InspectorFronendImpl::Register(int port) {
void InspectorFrontendImpl::Register(int port) {
auto& servers = g_servers.Get();
auto iter = servers.find(port);
if (iter != servers.end())
......@@ -81,13 +81,13 @@ void InspectorFronendImpl::Register(int port) {
port_ = port;
}
void InspectorFronendImpl::Unregister() {
void InspectorFrontendImpl::Unregister() {
DCHECK(g_servers.Get().find(port_)->second == this);
g_servers.Get().erase(port_);
port_ = kNotConnected;
}
void InspectorFronendImpl::SendMessage(const mojo::String& message) {
void InspectorFrontendImpl::SendMessage(const mojo::String& message) {
if (connection_id_ == kNotConnected)
return;
web_server_->SendOverWebSocket(connection_id_, message);
......
......@@ -14,11 +14,11 @@
namespace sky {
namespace inspector {
class InspectorFronendImpl : public mojo::InterfaceImpl<InspectorFrontend>,
class InspectorFrontendImpl : public mojo::InterfaceImpl<InspectorFrontend>,
public net::HttpServer::Delegate {
public:
InspectorFronendImpl();
virtual ~InspectorFronendImpl();
InspectorFrontendImpl();
virtual ~InspectorFrontendImpl();
private:
// From net::HttpServer::Delegate
......@@ -31,7 +31,7 @@ class InspectorFronendImpl : public mojo::InterfaceImpl<InspectorFrontend>,
int connection_id, const std::string& data) override;
virtual void OnClose(int connection_id) override;
// From InspectorFronend
// From InspectorFrontend
virtual void Listen(int32_t port) override;
virtual void SendMessage(const mojo::String&) override;
......@@ -44,11 +44,11 @@ class InspectorFronendImpl : public mojo::InterfaceImpl<InspectorFrontend>,
int connection_id_;
scoped_ptr<net::HttpServer> web_server_;
MOJO_DISALLOW_COPY_AND_ASSIGN(InspectorFronendImpl);
MOJO_DISALLOW_COPY_AND_ASSIGN(InspectorFrontendImpl);
};
typedef mojo::InterfaceFactoryImpl<
InspectorFronendImpl> InspectorFronendFactory;
InspectorFrontendImpl> InspectorFrontendFactory;
} // namespace tester
} // namespace sky
......
......@@ -23,11 +23,11 @@ class Server : public mojo::ApplicationDelegate {
virtual bool ConfigureIncomingConnection(
mojo::ApplicationConnection* connection) override {
connection->AddService(&fronend_factory_);
connection->AddService(&frontend_factory_);
return true;
}
InspectorFronendFactory fronend_factory_;
InspectorFrontendFactory frontend_factory_;
DISALLOW_COPY_AND_ASSIGN(Server);
};
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册