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

Unified Diff: device/bluetooth/bluetooth_adapter_factory.h

Issue 11075006: Moved bluetooth adapter files to device/bluetooth/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: renamed 'bluetooth' target to 'device_bluetooth'. 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 side-by-side diff with in-line comments
Download patch
Index: device/bluetooth/bluetooth_adapter_factory.h
diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_adapter_factory.h b/device/bluetooth/bluetooth_adapter_factory.h
similarity index 64%
rename from chrome/browser/chromeos/bluetooth/bluetooth_adapter_factory.h
rename to device/bluetooth/bluetooth_adapter_factory.h
index 0cd4b240a60e1ffc4603127bb4c2df974e57ad9e..82e1e6f90eb4396d276fd2c7351183cd21ef0da7 100644
--- a/chrome/browser/chromeos/bluetooth/bluetooth_adapter_factory.h
+++ b/device/bluetooth/bluetooth_adapter_factory.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_ADAPTER_FACTORY_H_
-#define CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_ADAPTER_FACTORY_H_
+#ifndef DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_FACTORY_H_
+#define DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_FACTORY_H_
#include <string>
#include "base/memory/ref_counted.h"
-namespace chromeos {
+namespace device {
class BluetoothAdapter;
@@ -19,14 +19,15 @@ class BluetoothAdapter;
class BluetoothAdapterFactory {
public:
// Returns the shared instance for the default adapter, whichever that may
- // be at the time. Use IsPresent() and the AdapterPresentChanged() observer
- // method to determine whether an adapter is actually available or not.
+ // be at the time. Check the returned scoped_refptr does not point to NULL and
+ // use IsPresent() and the AdapterPresentChanged() observer method to
+ // determine whether an adapter is actually available or not.
static scoped_refptr<BluetoothAdapter> DefaultAdapter();
// Creates an instance for a specific adapter at address |address|.
static BluetoothAdapter* Create(const std::string& address);
};
-} // namespace chromeos
+} // namespace device
-#endif // CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_ADAPTER_FACTORY_H_
+#endif // DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_FACTORY_H_

Powered by Google App Engine
This is Rietveld 408576698