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

Side by Side Diff: trunk/src/device/bluetooth/bluetooth_profile.cc

Issue 224763003: Revert 261566 "device/bluetooth: Rename device::bluetooth_utils:..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 8 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_profile.h" 5 #include "device/bluetooth/bluetooth_profile.h"
6 6
7 #if defined(OS_CHROMEOS) 7 #if defined(OS_CHROMEOS)
8 #include "device/bluetooth/bluetooth_profile_chromeos.h" 8 #include "device/bluetooth/bluetooth_profile_chromeos.h"
9 #elif defined(OS_MACOSX) 9 #elif defined(OS_MACOSX)
10 #include "base/mac/mac_util.h" 10 #include "base/mac/mac_util.h"
11 #include "device/bluetooth/bluetooth_profile_mac.h" 11 #include "device/bluetooth/bluetooth_profile_mac.h"
12 #elif defined(OS_WIN) 12 #elif defined(OS_WIN)
13 #include "device/bluetooth/bluetooth_profile_win.h" 13 #include "device/bluetooth/bluetooth_profile_win.h"
14 #endif 14 #endif
15 15
16 #include <string>
17
16 namespace device { 18 namespace device {
17 19
18 BluetoothProfile::Options::Options() 20 BluetoothProfile::Options::Options()
19 : channel(0), 21 : channel(0),
20 psm(0), 22 psm(0),
21 require_authentication(false), 23 require_authentication(false),
22 require_authorization(false), 24 require_authorization(false),
23 auto_connect(false), 25 auto_connect(false),
24 version(0), 26 version(0),
25 features(0) { 27 features(0) {
26 } 28 }
27 29
28 BluetoothProfile::Options::~Options() { 30 BluetoothProfile::Options::~Options() {
29 31
30 } 32 }
31 33
32 34
33 BluetoothProfile::BluetoothProfile() { 35 BluetoothProfile::BluetoothProfile() {
34 36
35 } 37 }
36 38
37 BluetoothProfile::~BluetoothProfile() { 39 BluetoothProfile::~BluetoothProfile() {
38 40
39 } 41 }
40 42
41 43
42 // static 44 // static
43 void BluetoothProfile::Register(const BluetoothUUID& uuid, 45 void BluetoothProfile::Register(const std::string& uuid,
44 const Options& options, 46 const Options& options,
45 const ProfileCallback& callback) { 47 const ProfileCallback& callback) {
46 #if defined(OS_CHROMEOS) 48 #if defined(OS_CHROMEOS)
47 chromeos::BluetoothProfileChromeOS* profile = NULL; 49 chromeos::BluetoothProfileChromeOS* profile = NULL;
48 profile = new chromeos::BluetoothProfileChromeOS(); 50 profile = new chromeos::BluetoothProfileChromeOS();
49 profile->Init(uuid, options, callback); 51 profile->Init(uuid, options, callback);
50 #elif defined(OS_MACOSX) 52 #elif defined(OS_MACOSX)
51 BluetoothProfile* profile = NULL; 53 BluetoothProfile* profile = NULL;
52 54
53 if (base::mac::IsOSLionOrLater()) 55 if (base::mac::IsOSLionOrLater())
54 profile = new BluetoothProfileMac(uuid, options.name); 56 profile = new BluetoothProfileMac(uuid, options.name);
55 callback.Run(profile); 57 callback.Run(profile);
56 #elif defined(OS_WIN) 58 #elif defined(OS_WIN)
57 BluetoothProfile* profile = NULL; 59 BluetoothProfile* profile = NULL;
58 profile = new BluetoothProfileWin(uuid, options.name); 60 profile = new BluetoothProfileWin(uuid, options.name);
59 callback.Run(profile); 61 callback.Run(profile);
60 #else 62 #else
61 callback.Run(NULL); 63 callback.Run(NULL);
62 #endif 64 #endif
63 } 65 }
64 66
65 } // namespace device 67 } // namespace device
OLDNEW
« no previous file with comments | « trunk/src/device/bluetooth/bluetooth_profile.h ('k') | trunk/src/device/bluetooth/bluetooth_profile_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698