| Index: extensions/browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.h
|
| diff --git a/chrome/browser/extensions/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.h b/extensions/browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.h
|
| similarity index 81%
|
| rename from chrome/browser/extensions/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.h
|
| rename to extensions/browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.h
|
| index a8011b4dd37d2eeecf64b8d64c63e64b7184da79..8f011caa53639cde0e0a8825a08e50a017d8821d 100644
|
| --- a/chrome/browser/extensions/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.h
|
| +++ b/extensions/browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.h
|
| @@ -2,12 +2,12 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_EXTENSIONS_API_SOCKETS_TCP_SERVER_TCP_SERVER_SOCKET_EVENT_DISPATCHER_H_
|
| -#define CHROME_BROWSER_EXTENSIONS_API_SOCKETS_TCP_SERVER_TCP_SERVER_SOCKET_EVENT_DISPATCHER_H_
|
| +#ifndef EXTENSIONS_BROWSER_API_SOCKETS_TCP_SERVER_TCP_SERVER_SOCKET_EVENT_DISPATCHER_H_
|
| +#define EXTENSIONS_BROWSER_API_SOCKETS_TCP_SERVER_TCP_SERVER_SOCKET_EVENT_DISPATCHER_H_
|
|
|
| #include "chrome/browser/extensions/api/api_resource_manager.h"
|
| -#include "chrome/browser/extensions/api/sockets_tcp/sockets_tcp_api.h"
|
| -#include "chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api.h"
|
| +#include "extensions/browser/api/sockets_tcp/sockets_tcp_api.h"
|
| +#include "extensions/browser/api/sockets_tcp_server/sockets_tcp_server_api.h"
|
|
|
| namespace content {
|
| class BrowserContext;
|
| @@ -19,7 +19,7 @@ class ResumableTCPSocket;
|
| }
|
|
|
| namespace extensions {
|
| -namespace api {
|
| +namespace core_api {
|
|
|
| // Dispatch events related to "sockets.tcp" sockets from callback on native
|
| // socket instances. There is one instance per profile.
|
| @@ -50,9 +50,7 @@ class TCPServerSocketEventDispatcher
|
| ClientSocketData;
|
| friend class BrowserContextKeyedAPIFactory<TCPServerSocketEventDispatcher>;
|
| // BrowserContextKeyedAPI implementation.
|
| - static const char* service_name() {
|
| - return "TCPServerSocketEventDispatcher";
|
| - }
|
| + static const char* service_name() { return "TCPServerSocketEventDispatcher"; }
|
| static const bool kServiceHasOwnInstanceInIncognito = true;
|
| static const bool kServiceIsNULLWhileTesting = true;
|
|
|
| @@ -79,11 +77,10 @@ class TCPServerSocketEventDispatcher
|
| // Called when socket accepts a new connection.
|
| static void AcceptCallback(const AcceptParams& params,
|
| int result_code,
|
| - net::TCPClientSocket *socket);
|
| + net::TCPClientSocket* socket);
|
|
|
| // Post an extension event from |thread_id| to UI thread
|
| - static void PostEvent(const AcceptParams& params,
|
| - scoped_ptr<Event> event);
|
| + static void PostEvent(const AcceptParams& params, scoped_ptr<Event> event);
|
|
|
| // Dispatch an extension event on to EventRouter instance on UI thread.
|
| static void DispatchEvent(void* browser_context_id,
|
| @@ -97,7 +94,7 @@ class TCPServerSocketEventDispatcher
|
| scoped_refptr<ClientSocketData> client_sockets_;
|
| };
|
|
|
| -} // namespace api
|
| +} // namespace core_api
|
| } // namespace extensions
|
|
|
| -#endif // CHROME_BROWSER_EXTENSIONS_API_SOCKETS_TCP_SERVER_TCP_SERVER_SOCKET_EVENT_DISPATCHER_H_
|
| +#endif // EXTENSIONS_BROWSER_API_SOCKETS_TCP_SERVER_TCP_SERVER_SOCKET_EVENT_DISPATCHER_H_
|
|
|