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

Side by Side Diff: device/bluetooth/bluetooth_adapter_factory.cc

Issue 11075006: Moved bluetooth adapter files to device/bluetooth/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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 // TODO(youngki): Guard the ChromeOS specific part with "#ifdef CHROME_OS" block 5 #include "device/bluetooth/bluetooth_adapter_factory.h"
6 // once we move this code into common directory.
7 6
8 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
9 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
10 #include "chrome/browser/chromeos/bluetooth/bluetooth_adapter_chromeos.h" 9
11 #include "chrome/browser/chromeos/bluetooth/bluetooth_adapter_factory.h" 10 #if defined(OS_CHROMEOS)
11 #include "device/bluetooth/bluetooth_adapter_chromeos.h"
12 #endif
12 13
13 namespace { 14 namespace {
14 15
15 // Shared default adapter instance, we don't want to keep this class around 16 // Shared default adapter instance, we don't want to keep this class around
16 // if nobody is using it so use a WeakPtr and create the object when needed; 17 // if nobody is using it so use a WeakPtr and create the object when needed;
17 // since Google C++ Style (and clang's static analyzer) forbids us having 18 // since Google C++ Style (and clang's static analyzer) forbids us having
18 // exit-time destructors we use a leaky lazy instance for it. 19 // exit-time destructors we use a leaky lazy instance for it.
19 base::LazyInstance<base::WeakPtr<chromeos::BluetoothAdapter> >::Leaky 20 base::LazyInstance<base::WeakPtr<device_bluetooth::BluetoothAdapter> >::Leaky
20 default_adapter = LAZY_INSTANCE_INITIALIZER; 21 default_adapter = LAZY_INSTANCE_INITIALIZER;
21 22
22 } // namespace 23 } // namespace
23 24
24 namespace chromeos { 25 namespace device_bluetooth {
25 26
26 // static 27 // static
27 scoped_refptr<BluetoothAdapter> BluetoothAdapterFactory::DefaultAdapter() { 28 scoped_refptr<BluetoothAdapter> BluetoothAdapterFactory::DefaultAdapter() {
29 scoped_refptr<BluetoothAdapter> adapter;
28 if (!default_adapter.Get().get()) { 30 if (!default_adapter.Get().get()) {
31 #if defined(OS_CHROMEOS)
29 BluetoothAdapterChromeOs* new_adapter = new BluetoothAdapterChromeOs; 32 BluetoothAdapterChromeOs* new_adapter = new BluetoothAdapterChromeOs;
30 new_adapter->TrackDefaultAdapter(); 33 new_adapter->TrackDefaultAdapter();
31 default_adapter.Get() = new_adapter->weak_ptr_factory_.GetWeakPtr(); 34 default_adapter.Get() = new_adapter->weak_ptr_factory_.GetWeakPtr();
35 adapter = default_adapter.Get();
36 #endif
32 } 37 }
33 38
34 return scoped_refptr<BluetoothAdapter>(default_adapter.Get()); 39 return adapter;
35 } 40 }
36 41
37 // static 42 // static
38 BluetoothAdapter* BluetoothAdapterFactory::Create(const std::string& address) { 43 BluetoothAdapter* BluetoothAdapterFactory::Create(const std::string& address) {
39 BluetoothAdapterChromeOs* adapter = new BluetoothAdapterChromeOs; 44 BluetoothAdapter* adapter = NULL;
40 adapter->FindAdapter(address); 45 #if defined(OS_CHROMEOS)
46 BluetoothAdapterChromeOs* adapter_chromeos = new BluetoothAdapterChromeOs;
47 adapter_chromeos->FindAdapter(address);
48 adapter = adapter_chromeos;
49 #endif
41 return adapter; 50 return adapter;
42 } 51 }
43 52
44 } // namespace chromeos 53 } // namespace device_bluetooth
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698