diff options
author | jamuraa <jamuraa@chromium.org> | 2015-04-30 22:41:30 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-01 05:42:12 +0000 |
commit | 9b067ebd454b73dab818c2cd62194d09d675ac7d (patch) | |
tree | f31787d0dfae88dc0b697d2437b7981f5e7c03d8 /chromeos | |
parent | 48d3db0433470914f929a7975109be5d72cf5ceb (diff) | |
download | chromium_src-9b067ebd454b73dab818c2cd62194d09d675ac7d.zip chromium_src-9b067ebd454b73dab818c2cd62194d09d675ac7d.tar.gz chromium_src-9b067ebd454b73dab818c2cd62194d09d675ac7d.tar.bz2 |
Roll src/third_party/cros_system_api 42cdfaa:60c18c4
Summary of changes avalable at:
https://chromium.googlesource.com/chromiumos/platform/system_api/+log/42cdfaa..60c18c4
Includes a typo fix for an updated constant.
BUG=466375
R=armansito@chromium.org
Review URL: https://codereview.chromium.org/1118163002
Cr-Commit-Position: refs/heads/master@{#327882}
Diffstat (limited to 'chromeos')
-rw-r--r-- | chromeos/dbus/bluetooth_le_advertisement_service_provider.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromeos/dbus/bluetooth_le_advertisement_service_provider.cc b/chromeos/dbus/bluetooth_le_advertisement_service_provider.cc index f6a4c44..a4aca3a 100644 --- a/chromeos/dbus/bluetooth_le_advertisement_service_provider.cc +++ b/chromeos/dbus/bluetooth_le_advertisement_service_provider.cc @@ -53,7 +53,7 @@ class BluetoothAdvertisementServiceProviderImpl // Export Bluetooth Advertisement interface methods. exported_object_->ExportMethod( - bluetooth_advertisement::kBluetoothAdvertisementIntervace, + bluetooth_advertisement::kBluetoothAdvertisementInterface, bluetooth_advertisement::kRelease, base::Bind(&BluetoothAdvertisementServiceProviderImpl::Release, weak_ptr_factory_.GetWeakPtr()), @@ -122,7 +122,7 @@ class BluetoothAdvertisementServiceProviderImpl // Only the advertisement interface is supported. if (interface_name != - bluetooth_advertisement::kBluetoothAdvertisementIntervace) { + bluetooth_advertisement::kBluetoothAdvertisementInterface) { scoped_ptr<dbus::ErrorResponse> error_response = dbus::ErrorResponse::FromMethodCall( method_call, kErrorInvalidArgs, @@ -196,7 +196,7 @@ class BluetoothAdvertisementServiceProviderImpl // Only the advertisement interface is supported. if (interface_name != - bluetooth_advertisement::kBluetoothAdvertisementIntervace) { + bluetooth_advertisement::kBluetoothAdvertisementInterface) { scoped_ptr<dbus::ErrorResponse> error_response = dbus::ErrorResponse::FromMethodCall( method_call, kErrorInvalidArgs, |