Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6054)

Unified Diff: chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc

Issue 11360200: Decouple bluetooth_event_router from extension_system. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Removed unnecessary if block Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc
diff --git a/chrome/browser/extensions/bluetooth_event_router.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc
similarity index 80%
rename from chrome/browser/extensions/bluetooth_event_router.cc
rename to chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc
index d38db9e8b925a6438b7a199889ee2f576b1ea5dc..e018f05870b5c9ccf8e86b559ebd93de12325d6e 100644
--- a/chrome/browser/extensions/bluetooth_event_router.cc
+++ b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc
@@ -2,9 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/extensions/bluetooth_event_router.h"
+#include "chrome/browser/extensions/api/bluetooth/bluetooth_event_router.h"
#include <map>
+#include <string>
#include "base/json/json_writer.h"
#include "base/memory/ref_counted.h"
@@ -26,20 +27,45 @@ ExtensionBluetoothEventRouter::ExtensionBluetoothEventRouter(Profile* profile)
: send_discovery_events_(false),
responsible_for_discovery_(false),
profile_(profile),
- adapter_(device::BluetoothAdapterFactory::DefaultAdapter()),
+ adapter_(NULL),
+ num_event_listeners_(0),
next_socket_id_(1) {
DCHECK(profile_);
- if (adapter_.get())
- adapter_->AddObserver(this);
}
ExtensionBluetoothEventRouter::~ExtensionBluetoothEventRouter() {
bryeung 2012/11/13 15:14:43 shouldn't this always release the adapter? Seems
youngki 2012/11/13 16:09:49 Done.
- if (adapter_.get())
- adapter_->RemoveObserver(this);
+ MaybeReleaseAdapter();
socket_map_.clear();
}
+scoped_refptr<const device::BluetoothAdapter>
+ExtensionBluetoothEventRouter::adapter() {
+ return GetMutableAdapter();
+}
+
+scoped_refptr<device::BluetoothAdapter>
+ExtensionBluetoothEventRouter::GetMutableAdapter() {
+ if (adapter_)
+ return adapter_;
+
+ return device::BluetoothAdapterFactory::DefaultAdapter();
+}
+
+void ExtensionBluetoothEventRouter::InitializeAdapterIfNeeded() {
+ if (!adapter_) {
+ adapter_ = GetMutableAdapter();
+ adapter_->AddObserver(this);
+ }
+}
+
+void ExtensionBluetoothEventRouter::MaybeReleaseAdapter() {
+ if (adapter_) {
+ adapter_->RemoveObserver(this);
+ adapter_ = NULL;
+ }
+}
+
int ExtensionBluetoothEventRouter::RegisterSocket(
scoped_refptr<device::BluetoothSocket> socket) {
// If there is a socket registered with the same fd, just return it's id
@@ -51,6 +77,7 @@ int ExtensionBluetoothEventRouter::RegisterSocket(
}
int return_id = next_socket_id_++;
socket_map_[return_id] = socket;
+ InitializeAdapterIfNeeded();
return return_id;
}
@@ -59,6 +86,8 @@ bool ExtensionBluetoothEventRouter::ReleaseSocket(int id) {
if (socket_entry == socket_map_.end())
return false;
socket_map_.erase(socket_entry);
+ if (!IsAdapterNeeded())
bryeung 2012/11/13 15:14:43 this check should be moved to MaybeReleaseAdapter
youngki 2012/11/13 16:09:49 Done.
+ MaybeReleaseAdapter();
return true;
}
@@ -70,6 +99,22 @@ ExtensionBluetoothEventRouter::GetSocket(int id) {
return socket_entry->second;
}
+bool ExtensionBluetoothEventRouter::IsAdapterNeeded() const {
bryeung 2012/11/13 15:14:43 no need for a separate method: roll this code into
youngki 2012/11/13 16:09:49 Done.
+ return num_event_listeners_ > 0 || socket_map_.size() > 0;
bryeung 2012/11/13 15:14:43 Actually: I don't think we need to check the socke
youngki 2012/11/13 16:09:49 Done. I removed the test of creating/removing adap
+}
+
+void ExtensionBluetoothEventRouter::OnListenerAdded() {
+ num_event_listeners_++;
+ InitializeAdapterIfNeeded();
+}
+
+void ExtensionBluetoothEventRouter::OnListenerRemoved() {
+ num_event_listeners_--;
+ DCHECK(num_event_listeners_ >= 0);
+ if (!IsAdapterNeeded())
+ MaybeReleaseAdapter();
+}
+
void ExtensionBluetoothEventRouter::SetResponsibleForDiscovery(
bool responsible) {
responsible_for_discovery_ = responsible;
@@ -103,7 +148,7 @@ void ExtensionBluetoothEventRouter::DispatchDeviceEvent(
void ExtensionBluetoothEventRouter::AdapterPresentChanged(
device::BluetoothAdapter* adapter, bool present) {
- if (adapter != adapter_.get()) {
+ if (adapter != adapter_) {
DVLOG(1) << "Ignoring event for adapter " << adapter->address();
return;
}
@@ -115,7 +160,7 @@ void ExtensionBluetoothEventRouter::AdapterPresentChanged(
void ExtensionBluetoothEventRouter::AdapterPoweredChanged(
device::BluetoothAdapter* adapter, bool has_power) {
- if (adapter != adapter_.get()) {
+ if (adapter != adapter_) {
DVLOG(1) << "Ignoring event for adapter " << adapter->address();
return;
}
@@ -127,7 +172,7 @@ void ExtensionBluetoothEventRouter::AdapterPoweredChanged(
void ExtensionBluetoothEventRouter::AdapterDiscoveringChanged(
device::BluetoothAdapter* adapter, bool discovering) {
- if (adapter != adapter_.get()) {
+ if (adapter != adapter_) {
DVLOG(1) << "Ignoring event for adapter " << adapter->address();
return;
}
@@ -146,7 +191,7 @@ void ExtensionBluetoothEventRouter::AdapterDiscoveringChanged(
void ExtensionBluetoothEventRouter::DeviceAdded(
device::BluetoothAdapter* adapter,
device::BluetoothDevice* device) {
- if (adapter != adapter_.get()) {
+ if (adapter != adapter_) {
DVLOG(1) << "Ignoring event for adapter " << adapter->address();
return;
}

Powered by Google App Engine
This is Rietveld 408576698