summaryrefslogtreecommitdiffstats
path: root/device/bluetooth/bluetooth_device.h
diff options
context:
space:
mode:
authordbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-19 22:45:25 +0000
committerdbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-19 22:45:25 +0000
commit13caac27a6d6751e9733ecb276029c2d9774b640 (patch)
tree3316f5058cc610fd67d2fb4aebbadcf4d5991163 /device/bluetooth/bluetooth_device.h
parent865eb546fe5b899158e031d22189323f49a05d30 (diff)
downloadchromium_src-13caac27a6d6751e9733ecb276029c2d9774b640.zip
chromium_src-13caac27a6d6751e9733ecb276029c2d9774b640.tar.gz
chromium_src-13caac27a6d6751e9733ecb276029c2d9774b640.tar.bz2
Add base:: to string16 in device/.
R=keybuk@chromium.org BUG=329295 Review URL: https://codereview.chromium.org/100683005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device/bluetooth/bluetooth_device.h')
-rw-r--r--device/bluetooth/bluetooth_device.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/device/bluetooth/bluetooth_device.h b/device/bluetooth/bluetooth_device.h
index aaf4e93..95fe683 100644
--- a/device/bluetooth/bluetooth_device.h
+++ b/device/bluetooth/bluetooth_device.h
@@ -188,7 +188,7 @@ class BluetoothDevice {
// Returns the name of the device suitable for displaying, this may
// be a synthesized string containing the address and localized type name
// if the device has no obtained name.
- virtual string16 GetName() const;
+ virtual base::string16 GetName() const;
// Returns the type of the device, limited to those we support or are
// aware of, by decoding the bluetooth class information. The returned
@@ -369,7 +369,7 @@ class BluetoothDevice {
private:
// Returns a localized string containing the device's bluetooth address and
// a device type for display when |name_| is empty.
- string16 GetAddressWithLocalizedDeviceTypeName() const;
+ base::string16 GetAddressWithLocalizedDeviceTypeName() const;
};
} // namespace device