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

Side by Side Diff: chrome/browser/chromeos/extensions/bluetooth_event_router.cc

Issue 10899037: Refactoring bluetooth API code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added #include <string> into bluetooth_adapter_dbus.cc. Created 8 years, 3 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/extensions/bluetooth_event_router.h" 5 #include "chrome/browser/chromeos/extensions/bluetooth_event_router.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "base/json/json_writer.h" 9 #include "base/json/json_writer.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "base/memory/scoped_vector.h" 11 #include "base/memory/scoped_vector.h"
12 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
13 #include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h" 13 #include "chrome/browser/chromeos/bluetooth/bluetooth_adapter_dbus.h"
14 #include "chrome/browser/chromeos/bluetooth/bluetooth_device.h" 14 #include "chrome/browser/chromeos/bluetooth/bluetooth_device_dbus.h"
15 #include "chrome/browser/chromeos/bluetooth/bluetooth_socket.h" 15 #include "chrome/browser/chromeos/bluetooth/bluetooth_socket_posix.h"
16 #include "chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.h" 16 #include "chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.h"
17 #include "chrome/browser/extensions/event_names.h" 17 #include "chrome/browser/extensions/event_names.h"
18 #include "chrome/browser/extensions/event_router.h" 18 #include "chrome/browser/extensions/event_router.h"
19 #include "chrome/common/extensions/api/experimental_bluetooth.h" 19 #include "chrome/common/extensions/api/experimental_bluetooth.h"
20 20
21 namespace experimental_bluetooth = extensions::api::experimental_bluetooth; 21 namespace experimental_bluetooth = extensions::api::experimental_bluetooth;
22 22
23 namespace chromeos { 23 namespace chromeos {
24 24
25 ExtensionBluetoothEventRouter::ExtensionBluetoothEventRouter(Profile* profile) 25 ExtensionBluetoothEventRouter::ExtensionBluetoothEventRouter(Profile* profile)
26 : profile_(profile), 26 : profile_(profile),
27 adapter_(chromeos::BluetoothAdapter::DefaultAdapter()), 27 adapter_(chromeos::BluetoothAdapterDBus::DefaultAdapter()),
28 next_socket_id_(1) { 28 next_socket_id_(1) {
29 DCHECK(profile_); 29 DCHECK(profile_);
30 DCHECK(adapter_.get()); 30 DCHECK(adapter_.get());
31 adapter_->AddObserver(this); 31 adapter_->AddObserver(this);
32 } 32 }
33 33
34 ExtensionBluetoothEventRouter::~ExtensionBluetoothEventRouter() { 34 ExtensionBluetoothEventRouter::~ExtensionBluetoothEventRouter() {
35 adapter_->RemoveObserver(this); 35 adapter_->RemoveObserver(this);
36 socket_map_.clear(); 36 socket_map_.clear();
37 } 37 }
38 38
39 int ExtensionBluetoothEventRouter::RegisterSocket( 39 int ExtensionBluetoothEventRouter::RegisterSocket(
40 scoped_refptr<BluetoothSocket> socket) { 40 scoped_refptr<BluetoothSocketPosix> socket) {
41 // If there is a socket registered with the same fd, just return it's id 41 // If there is a socket registered with the same fd, just return it's id
42 for (SocketMap::const_iterator i = socket_map_.begin(); 42 for (SocketMap::const_iterator i = socket_map_.begin();
43 i != socket_map_.end(); ++i) { 43 i != socket_map_.end(); ++i) {
44 if (i->second->fd() == socket->fd()) { 44 if (i->second->fd() == socket->fd()) {
45 return i->first; 45 return i->first;
46 } 46 }
47 } 47 }
48 int return_id = next_socket_id_++; 48 int return_id = next_socket_id_++;
49 socket_map_[return_id] = socket; 49 socket_map_[return_id] = socket;
50 return return_id; 50 return return_id;
51 } 51 }
52 52
53 bool ExtensionBluetoothEventRouter::ReleaseSocket(int id) { 53 bool ExtensionBluetoothEventRouter::ReleaseSocket(int id) {
54 SocketMap::iterator socket_entry = socket_map_.find(id); 54 SocketMap::iterator socket_entry = socket_map_.find(id);
55 if (socket_entry == socket_map_.end()) 55 if (socket_entry == socket_map_.end())
56 return false; 56 return false;
57 socket_map_.erase(socket_entry); 57 socket_map_.erase(socket_entry);
58 return true; 58 return true;
59 } 59 }
60 60
61 scoped_refptr<BluetoothSocket> ExtensionBluetoothEventRouter::GetSocket( 61 scoped_refptr<BluetoothSocketPosix> ExtensionBluetoothEventRouter::GetSocket(
62 int id) { 62 int id) {
63 SocketMap::iterator socket_entry = socket_map_.find(id); 63 SocketMap::iterator socket_entry = socket_map_.find(id);
64 if (socket_entry == socket_map_.end()) 64 if (socket_entry == socket_map_.end())
65 return NULL; 65 return NULL;
66 return socket_entry->second; 66 return socket_entry->second;
67 } 67 }
68 68
69 void ExtensionBluetoothEventRouter::SetResponsibleForDiscovery( 69 void ExtensionBluetoothEventRouter::SetResponsibleForDiscovery(
70 bool responsible) { 70 bool responsible) {
71 responsible_for_discovery_ = responsible; 71 responsible_for_discovery_ = responsible;
(...skipping 10 matching lines...) Expand all
82 for (DeviceList::const_iterator i = discovered_devices_.begin(); 82 for (DeviceList::const_iterator i = discovered_devices_.begin();
83 i != discovered_devices_.end(); ++i) { 83 i != discovered_devices_.end(); ++i) {
84 DispatchDeviceEvent(**i); 84 DispatchDeviceEvent(**i);
85 } 85 }
86 } 86 }
87 87
88 send_discovery_events_ = should_send; 88 send_discovery_events_ = should_send;
89 } 89 }
90 90
91 void ExtensionBluetoothEventRouter::AdapterPresentChanged( 91 void ExtensionBluetoothEventRouter::AdapterPresentChanged(
92 chromeos::BluetoothAdapter* adapter, bool present) { 92 chromeos::BluetoothAdapterDBus* adapter, bool present) {
93 if (adapter != adapter_.get()) { 93 if (adapter != adapter_.get()) {
94 DVLOG(1) << "Ignoring event for adapter " << adapter->address(); 94 DVLOG(1) << "Ignoring event for adapter " << adapter->address();
95 return; 95 return;
96 } 96 }
97 97
98 DispatchBooleanValueEvent( 98 DispatchBooleanValueEvent(
99 extensions::event_names::kBluetoothOnAvailabilityChanged, 99 extensions::event_names::kBluetoothOnAvailabilityChanged,
100 present); 100 present);
101 } 101 }
102 102
103 void ExtensionBluetoothEventRouter::AdapterPoweredChanged( 103 void ExtensionBluetoothEventRouter::AdapterPoweredChanged(
104 chromeos::BluetoothAdapter* adapter, bool has_power) { 104 chromeos::BluetoothAdapterDBus* adapter, bool has_power) {
105 if (adapter != adapter_.get()) { 105 if (adapter != adapter_.get()) {
106 DVLOG(1) << "Ignoring event for adapter " << adapter->address(); 106 DVLOG(1) << "Ignoring event for adapter " << adapter->address();
107 return; 107 return;
108 } 108 }
109 109
110 DispatchBooleanValueEvent( 110 DispatchBooleanValueEvent(
111 extensions::event_names::kBluetoothOnPowerChanged, 111 extensions::event_names::kBluetoothOnPowerChanged,
112 has_power); 112 has_power);
113 } 113 }
114 114
115 void ExtensionBluetoothEventRouter::AdapterDiscoveringChanged( 115 void ExtensionBluetoothEventRouter::AdapterDiscoveringChanged(
116 chromeos::BluetoothAdapter* adapter, bool discovering) { 116 chromeos::BluetoothAdapterDBus* adapter, bool discovering) {
117 if (adapter != adapter_.get()) { 117 if (adapter != adapter_.get()) {
118 DVLOG(1) << "Ignoring event for adapter " << adapter->address(); 118 DVLOG(1) << "Ignoring event for adapter " << adapter->address();
119 return; 119 return;
120 } 120 }
121 121
122 if (!discovering) { 122 if (!discovering) {
123 send_discovery_events_ = false; 123 send_discovery_events_ = false;
124 responsible_for_discovery_ = false; 124 responsible_for_discovery_ = false;
125 discovered_devices_.clear(); 125 discovered_devices_.clear();
126 } 126 }
127 127
128 DispatchBooleanValueEvent( 128 DispatchBooleanValueEvent(
129 extensions::event_names::kBluetoothOnDiscoveringChanged, 129 extensions::event_names::kBluetoothOnDiscoveringChanged,
130 discovering); 130 discovering);
131 } 131 }
132 132
133 void ExtensionBluetoothEventRouter::DeviceAdded( 133 void ExtensionBluetoothEventRouter::DeviceAdded(
134 chromeos::BluetoothAdapter* adapter, chromeos::BluetoothDevice* device) { 134 chromeos::BluetoothAdapterDBus* adapter,
135 chromeos::BluetoothDeviceDBus* device) {
135 if (adapter != adapter_.get()) { 136 if (adapter != adapter_.get()) {
136 DVLOG(1) << "Ignoring event for adapter " << adapter->address(); 137 DVLOG(1) << "Ignoring event for adapter " << adapter->address();
137 return; 138 return;
138 } 139 }
139 140
140 experimental_bluetooth::Device* extension_device = 141 experimental_bluetooth::Device* extension_device =
141 new experimental_bluetooth::Device(); 142 new experimental_bluetooth::Device();
142 experimental_bluetooth::BluetoothDeviceToApiDevice(*device, extension_device); 143 experimental_bluetooth::BluetoothDeviceToApiDevice(*device, extension_device);
143 discovered_devices_.push_back(extension_device); 144 discovered_devices_.push_back(extension_device);
144 145
(...skipping 16 matching lines...) Expand all
161 scoped_ptr<ListValue> args(new ListValue()); 162 scoped_ptr<ListValue> args(new ListValue());
162 args->Append(device.ToValue().release()); 163 args->Append(device.ToValue().release());
163 profile_->GetExtensionEventRouter()->DispatchEventToRenderers( 164 profile_->GetExtensionEventRouter()->DispatchEventToRenderers(
164 extensions::event_names::kBluetoothOnDeviceDiscovered, 165 extensions::event_names::kBluetoothOnDeviceDiscovered,
165 args.Pass(), 166 args.Pass(),
166 NULL, 167 NULL,
167 GURL()); 168 GURL());
168 } 169 }
169 170
170 } // namespace chromeos 171 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698