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

Unified Diff: trunk/src/device/bluetooth/bluetooth_profile_chromeos.h

Issue 224763003: Revert 261566 "device/bluetooth: Rename device::bluetooth_utils:..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 9 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: trunk/src/device/bluetooth/bluetooth_profile_chromeos.h
===================================================================
--- trunk/src/device/bluetooth/bluetooth_profile_chromeos.h (revision 261569)
+++ trunk/src/device/bluetooth/bluetooth_profile_chromeos.h (working copy)
@@ -17,7 +17,6 @@
#include "dbus/object_path.h"
#include "device/bluetooth/bluetooth_adapter.h"
#include "device/bluetooth/bluetooth_profile.h"
-#include "device/bluetooth/bluetooth_uuid.h"
namespace dbus {
@@ -40,7 +39,7 @@
const ConnectionCallback& callback) OVERRIDE;
// Return the UUID of the profile.
- const device::BluetoothUUID& uuid() const { return uuid_; }
+ const std::string& uuid() const { return uuid_; }
private:
friend class BluetoothProfile;
@@ -51,7 +50,7 @@
// Called by BluetoothProfile::Register to initialize the profile object
// asynchronously. |uuid|, |options| and |callback| are the arguments to
// BluetoothProfile::Register.
- void Init(const device::BluetoothUUID& uuid,
+ void Init(const std::string& uuid,
const device::BluetoothProfile::Options& options,
const ProfileCallback& callback);
@@ -106,7 +105,7 @@
scoped_ptr<dbus::FileDescriptor> fd);
// UUID of the profile passed during initialization.
- device::BluetoothUUID uuid_;
+ std::string uuid_;
// Copy of the profile options passed during initialization.
BluetoothProfileManagerClient::Options options_;
« no previous file with comments | « trunk/src/device/bluetooth/bluetooth_profile.cc ('k') | trunk/src/device/bluetooth/bluetooth_profile_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698