diff options
| author | keybuk@chromium.org <keybuk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 21:45:44 +0000 |
|---|---|---|
| committer | keybuk@chromium.org <keybuk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 21:45:44 +0000 |
| commit | 559a9a4fd35509a6acd6a10bb463230e1512eb1b (patch) | |
| tree | daf57ec754c68bb97e060b18a17893487a4bda60 /chrome/browser/extensions/browser_context_keyed_service_factories.cc | |
| parent | 0bb29bdceb67aab9bb19599380938d2cd6f60306 (diff) | |
| download | chromium_src-559a9a4fd35509a6acd6a10bb463230e1512eb1b.zip chromium_src-559a9a4fd35509a6acd6a10bb463230e1512eb1b.tar.gz chromium_src-559a9a4fd35509a6acd6a10bb463230e1512eb1b.tar.bz2 | |
Move methods from chrome.bluetooth to chrome.bluetoothSocket
The updateSocket(), setSocketPaused(), send(), getSocket() and
getSockets() are moved to chrome.bluetoothSocket, renaming as necessary,
with the old implementation replaced by a stub that returns an error.
When un-paused sockets generate chrome.bluetoothSocket.onReceive and
chrome.bluetoothSocket.onReceiveError events instead of the old events
which are now unused.
Also implements chrome.bluetoothSocket.create() and close() to complete
the lifetime of the socket.
Since BluetoothSocket is self-contained, and does not need references to
the adapter or observer methods, BluetoothSocketEventDispatcher changes
from being a refcounted object to BrowserContextKeyedAPI, matching the
sockets API.
BUG=349475,364581
Review URL: https://codereview.chromium.org/252673004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267344 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/browser_context_keyed_service_factories.cc')
| -rw-r--r-- | chrome/browser/extensions/browser_context_keyed_service_factories.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/extensions/browser_context_keyed_service_factories.cc b/chrome/browser/extensions/browser_context_keyed_service_factories.cc index 8a79b26..c9f3c43 100644 --- a/chrome/browser/extensions/browser_context_keyed_service_factories.cc +++ b/chrome/browser/extensions/browser_context_keyed_service_factories.cc @@ -11,6 +11,7 @@ #include "chrome/browser/extensions/api/bluetooth/bluetooth_api.h" #include "chrome/browser/extensions/api/bluetooth/bluetooth_private_api.h" #include "chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_api.h" +#include "chrome/browser/extensions/api/bluetooth_socket/bluetooth_socket_event_dispatcher.h" #include "chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h" #include "chrome/browser/extensions/api/bookmarks/bookmarks_api.h" #include "chrome/browser/extensions/api/braille_display_private/braille_display_private_api.h" @@ -163,6 +164,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() { #endif TokenCacheServiceFactory::GetInstance(); extensions::ExtensionGCMAppHandler::GetFactoryInstance(); + extensions::api::BluetoothSocketEventDispatcher::GetFactoryInstance(); } } // namespace chrome_extensions |