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

Side by Side Diff: device/bluetooth/bluetooth_low_energy_discovery_manager_mac.mm

Issue 917063004: Convert Obj-C 2.0 syntax to Obj-C 1.0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "device/bluetooth/bluetooth_low_energy_discovery_manager_mac.h" 5 #include "device/bluetooth/bluetooth_low_energy_discovery_manager_mac.h"
6 6
7 #include "base/mac/mac_util.h" 7 #include "base/mac/mac_util.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/strings/sys_string_conversions.h" 9 #include "base/strings/sys_string_conversions.h"
10 #include "device/bluetooth/bluetooth_low_energy_device_mac.h" 10 #include "device/bluetooth/bluetooth_low_energy_device_mac.h"
(...skipping 23 matching lines...) Expand all
34 virtual void TryStartDiscovery() { manager_->TryStartDiscovery(); } 34 virtual void TryStartDiscovery() { manager_->TryStartDiscovery(); }
35 35
36 private: 36 private:
37 BluetoothLowEnergyDiscoveryManagerMac* manager_; 37 BluetoothLowEnergyDiscoveryManagerMac* manager_;
38 }; 38 };
39 39
40 } // namespace device 40 } // namespace device
41 41
42 // This class will serve as the Objective-C delegate of CBCentralManager. 42 // This class will serve as the Objective-C delegate of CBCentralManager.
43 @interface BluetoothLowEnergyDiscoveryManagerMacBridge 43 @interface BluetoothLowEnergyDiscoveryManagerMacBridge
44 : NSObject<CBCentralManagerDelegate> 44 : NSObject<CBCentralManagerDelegate> {
45 BluetoothLowEnergyDiscoveryManagerMac* manager_;
46 scoped_ptr<BluetoothLowEnergyDiscoveryManagerMacDelegate> delegate_;
47 }
45 48
46 - (id)initWithManager:(BluetoothLowEnergyDiscoveryManagerMac*)manager; 49 - (id)initWithManager:(BluetoothLowEnergyDiscoveryManagerMac*)manager;
47 50
48 @end 51 @end
49 52
50 @implementation BluetoothLowEnergyDiscoveryManagerMacBridge { 53 @implementation BluetoothLowEnergyDiscoveryManagerMacBridge
51 BluetoothLowEnergyDiscoveryManagerMac* manager_;
52 scoped_ptr<BluetoothLowEnergyDiscoveryManagerMacDelegate> delegate_;
53 }
54 54
55 - (id)initWithManager:(BluetoothLowEnergyDiscoveryManagerMac*)manager { 55 - (id)initWithManager:(BluetoothLowEnergyDiscoveryManagerMac*)manager {
56 if ((self = [super init])) { 56 if ((self = [super init])) {
57 manager_ = manager; 57 manager_ = manager;
58 delegate_.reset( 58 delegate_.reset(
59 new BluetoothLowEnergyDiscoveryManagerMacDelegate(manager_)); 59 new BluetoothLowEnergyDiscoveryManagerMacDelegate(manager_));
60 } 60 }
61 return self; 61 return self;
62 } 62 }
63 63
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 manager_.reset( 173 manager_.reset(
174 [[aClass alloc] initWithDelegate:bridge_ 174 [[aClass alloc] initWithDelegate:bridge_
175 queue:dispatch_get_main_queue()]); 175 queue:dispatch_get_main_queue()]);
176 } 176 }
177 discovering_ = false; 177 discovering_ = false;
178 } 178 }
179 179
180 void BluetoothLowEnergyDiscoveryManagerMac::ClearDevices() { 180 void BluetoothLowEnergyDiscoveryManagerMac::ClearDevices() {
181 STLDeleteValues(&devices_); 181 STLDeleteValues(&devices_);
182 } 182 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698