summaryrefslogtreecommitdiffstats
path: root/device
diff options
context:
space:
mode:
authorkeybuk@chromium.org <keybuk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-08 23:00:10 +0000
committerkeybuk@chromium.org <keybuk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-08 23:00:10 +0000
commit7069f2cc46e97be0b39fba0a3ac59dd90e8fa99f (patch)
tree16f95b2808d1abe9ad9fab51669822b3c256c6a0 /device
parentffaf79ca738992bbf56553e632fdd006a713961b (diff)
downloadchromium_src-7069f2cc46e97be0b39fba0a3ac59dd90e8fa99f.zip
chromium_src-7069f2cc46e97be0b39fba0a3ac59dd90e8fa99f.tar.gz
chromium_src-7069f2cc46e97be0b39fba0a3ac59dd90e8fa99f.tar.bz2
Remove Debug restriction on Bluetooth log messages
We frequently need to access these in real builds after all. BUG=none TEST=chrome --vmodule=*bluetooth*=3 Review URL: https://chromiumcodereview.appspot.com/12379062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187064 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device')
-rw-r--r--device/bluetooth/bluetooth_adapter_chromeos.cc36
-rw-r--r--device/bluetooth/bluetooth_device_chromeos.cc32
2 files changed, 34 insertions, 34 deletions
diff --git a/device/bluetooth/bluetooth_adapter_chromeos.cc b/device/bluetooth/bluetooth_adapter_chromeos.cc
index efd97a89..335cd77 100644
--- a/device/bluetooth/bluetooth_adapter_chromeos.cc
+++ b/device/bluetooth/bluetooth_adapter_chromeos.cc
@@ -134,7 +134,7 @@ void BluetoothAdapterChromeOS::ReadLocalOutOfBandPairingData(
}
void BluetoothAdapterChromeOS::TrackDefaultAdapter() {
- DVLOG(1) << "Tracking default adapter";
+ VLOG(1) << "Tracking default adapter";
track_default_ = true;
DBusThreadManager::Get()->GetBluetoothManagerClient()->
DefaultAdapter(base::Bind(&BluetoothAdapterChromeOS::AdapterCallback,
@@ -142,7 +142,7 @@ void BluetoothAdapterChromeOS::TrackDefaultAdapter() {
}
void BluetoothAdapterChromeOS::FindAdapter(const std::string& address) {
- DVLOG(1) << "Using adapter " << address;
+ VLOG(1) << "Using adapter " << address;
track_default_ = false;
DBusThreadManager::Get()->GetBluetoothManagerClient()->
FindAdapter(address,
@@ -175,14 +175,14 @@ void BluetoothAdapterChromeOS::AdapterRemoved(
void BluetoothAdapterChromeOS::ChangeAdapter(
const dbus::ObjectPath& adapter_path) {
if (object_path_.value().empty()) {
- DVLOG(1) << "Adapter path initialized to " << adapter_path.value();
+ VLOG(1) << "Adapter path initialized to " << adapter_path.value();
} else if (object_path_.value() != adapter_path.value()) {
- DVLOG(1) << "Adapter path changed from " << object_path_.value()
- << " to " << adapter_path.value();
+ VLOG(1) << "Adapter path changed from " << object_path_.value()
+ << " to " << adapter_path.value();
RemoveAdapter();
} else {
- DVLOG(1) << "Adapter address updated";
+ VLOG(1) << "Adapter address updated";
}
object_path_ = adapter_path;
@@ -197,7 +197,7 @@ void BluetoothAdapterChromeOS::ChangeAdapter(
// Delay announcing a new adapter until we have an address.
if (address_.empty()) {
- DVLOG(1) << "Adapter address not yet known";
+ VLOG(1) << "Adapter address not yet known";
return;
}
@@ -212,7 +212,7 @@ void BluetoothAdapterChromeOS::ChangeAdapter(
void BluetoothAdapterChromeOS::RemoveAdapter() {
const bool adapter_was_present = IsPresent();
- DVLOG(1) << "Adapter lost.";
+ VLOG(1) << "Adapter lost.";
PoweredChanged(false);
DiscoveringChanged(false);
ClearDevices();
@@ -252,7 +252,7 @@ void BluetoothAdapterChromeOS::OnStartDiscovery(
bool success) {
if (success) {
if (discovering_count_++ == 0) {
- DVLOG(1) << object_path_.value() << ": started discovery.";
+ VLOG(1) << object_path_.value() << ": started discovery.";
// Clear devices found in previous discovery attempts
ClearDiscoveredDevices();
@@ -274,7 +274,7 @@ void BluetoothAdapterChromeOS::OnStopDiscovery(
bool success) {
if (success) {
if (--discovering_count_ == 0) {
- DVLOG(1) << object_path_.value() << ": stopped discovery.";
+ VLOG(1) << object_path_.value() << ": stopped discovery.";
FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
AdapterDiscoveringChanged(this, false));
@@ -380,8 +380,8 @@ void BluetoothAdapterChromeOS::UpdateDevice(
const bool was_paired = device->IsPaired();
if (!was_paired) {
- DVLOG(1) << "Assigned object path " << device_path.value() << " to device "
- << address;
+ VLOG(1) << "Assigned object path " << device_path.value() << " to device "
+ << address;
device->SetObjectPath(device_path);
}
device->Update(properties, true);
@@ -440,12 +440,12 @@ void BluetoothAdapterChromeOS::DeviceRemoved(
FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
DeviceRemoved(this, device));
- DVLOG(1) << "Removed device " << device->address();
+ VLOG(1) << "Removed device " << device->address();
delete device;
devices_.erase(temp);
} else {
- DVLOG(1) << "Removed object path from device " << device->address();
+ VLOG(1) << "Removed object path from device " << device->address();
device->RemoveObjectPath();
FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
@@ -498,7 +498,7 @@ void BluetoothAdapterChromeOS::DeviceFound(
devices_[address] = device;
}
- DVLOG(1) << "Device " << address << " is visible to the adapter";
+ VLOG(1) << "Device " << address << " is visible to the adapter";
device->SetVisible(true);
device->Update(&properties, false);
@@ -531,14 +531,14 @@ void BluetoothAdapterChromeOS::DeviceDisappeared(
FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
DeviceRemoved(this, device));
- DVLOG(1) << "Discovered device " << device->address()
+ VLOG(1) << "Discovered device " << device->address()
<< " is no longer visible to the adapter";
delete device;
devices_.erase(iter);
} else {
- DVLOG(1) << "Paired device " << device->address()
- << " is no longer visible to the adapter";
+ VLOG(1) << "Paired device " << device->address()
+ << " is no longer visible to the adapter";
device->SetVisible(false);
FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
diff --git a/device/bluetooth/bluetooth_device_chromeos.cc b/device/bluetooth/bluetooth_device_chromeos.cc
index d40e092..bef006f 100644
--- a/device/bluetooth/bluetooth_device_chromeos.cc
+++ b/device/bluetooth/bluetooth_device_chromeos.cc
@@ -169,7 +169,7 @@ void BluetoothDeviceChromeOS::Connect(
agent_.reset(NULL);
}
- DVLOG(1) << "Pairing: " << address_;
+ VLOG(1) << "Pairing: " << address_;
DBusThreadManager::Get()->GetBluetoothAdapterClient()->
CreatePairedDevice(
adapter_->object_path_,
@@ -371,7 +371,7 @@ void BluetoothDeviceChromeOS::OnCreateDevice(
const base::Closure& callback,
const ConnectErrorCallback& error_callback,
const dbus::ObjectPath& device_path) {
- DVLOG(1) << "Connection successful: " << device_path.value();
+ VLOG(1) << "Connection successful: " << device_path.value();
if (object_path_.value().empty()) {
object_path_ = device_path;
} else {
@@ -483,8 +483,8 @@ void BluetoothDeviceChromeOS::OnServiceRecordsChanged(void) {
// adapter and can't be reconnected from the adapter. To avoid problems with
// devices that don't export this properties we asume they are connectable.
connectable_ = hid_normally_connectable || !hid_reconnect_initiate;
- DVLOG(1) << "ServiceRecordsChanged for " << address_
- << ": connectable = " << connectable_;
+ VLOG(1) << "ServiceRecordsChanged for " << address_
+ << ": connectable = " << connectable_;
}
void BluetoothDeviceChromeOS::OnSetTrusted(bool success) {
@@ -599,8 +599,8 @@ void BluetoothDeviceChromeOS::OnIntrospect(
void BluetoothDeviceChromeOS::OnConnect(const base::Closure& callback,
const std::string& interface_name,
const dbus::ObjectPath& device_path) {
- DVLOG(1) << "Application connection successful: " << device_path.value()
- << ": " << interface_name;
+ VLOG(1) << "Application connection successful: " << device_path.value()
+ << ": " << interface_name;
connecting_applications_counter_--;
// |callback| should only be called once, meaning it cannot be called before
@@ -649,15 +649,15 @@ void BluetoothDeviceChromeOS::DisconnectCallback(
bool success) {
DCHECK(device_path == object_path_);
if (success) {
- DVLOG(1) << "Disconnection successful: " << address_;
+ VLOG(1) << "Disconnection successful: " << address_;
callback.Run();
} else {
if (connected_) {
LOG(WARNING) << "Disconnection failed: " << address_;
error_callback.Run();
} else {
- DVLOG(1) << "Disconnection failed on a already disconnected device: "
- << address_;
+ VLOG(1) << "Disconnection failed on a already disconnected device: "
+ << address_;
callback.Run();
}
}
@@ -745,7 +745,7 @@ void BluetoothDeviceChromeOS::DisconnectRequested(
void BluetoothDeviceChromeOS::Release() {
DCHECK(agent_.get());
- DVLOG(1) << "Release: " << address_;
+ VLOG(1) << "Release: " << address_;
DCHECK(pairing_delegate_);
pairing_delegate_->DismissDisplayOrConfirm();
@@ -762,7 +762,7 @@ void BluetoothDeviceChromeOS::RequestPinCode(
const dbus::ObjectPath& device_path,
const PinCodeCallback& callback) {
DCHECK(agent_.get());
- DVLOG(1) << "RequestPinCode: " << device_path.value();
+ VLOG(1) << "RequestPinCode: " << device_path.value();
DCHECK(pairing_delegate_);
DCHECK(pincode_callback_.is_null());
@@ -775,7 +775,7 @@ void BluetoothDeviceChromeOS::RequestPasskey(
const PasskeyCallback& callback) {
DCHECK(agent_.get());
DCHECK(device_path == object_path_);
- DVLOG(1) << "RequestPasskey: " << device_path.value();
+ VLOG(1) << "RequestPasskey: " << device_path.value();
DCHECK(pairing_delegate_);
DCHECK(passkey_callback_.is_null());
@@ -788,7 +788,7 @@ void BluetoothDeviceChromeOS::DisplayPinCode(
const std::string& pincode) {
DCHECK(agent_.get());
DCHECK(device_path == object_path_);
- DVLOG(1) << "DisplayPinCode: " << device_path.value() << " " << pincode;
+ VLOG(1) << "DisplayPinCode: " << device_path.value() << " " << pincode;
DCHECK(pairing_delegate_);
pairing_delegate_->DisplayPinCode(this, pincode);
@@ -799,7 +799,7 @@ void BluetoothDeviceChromeOS::DisplayPasskey(
uint32 passkey) {
DCHECK(agent_.get());
DCHECK(device_path == object_path_);
- DVLOG(1) << "DisplayPasskey: " << device_path.value() << " " << passkey;
+ VLOG(1) << "DisplayPasskey: " << device_path.value() << " " << passkey;
DCHECK(pairing_delegate_);
pairing_delegate_->DisplayPasskey(this, passkey);
@@ -811,7 +811,7 @@ void BluetoothDeviceChromeOS::RequestConfirmation(
const ConfirmationCallback& callback) {
DCHECK(agent_.get());
DCHECK(device_path == object_path_);
- DVLOG(1) << "RequestConfirmation: " << device_path.value() << " " << passkey;
+ VLOG(1) << "RequestConfirmation: " << device_path.value() << " " << passkey;
DCHECK(pairing_delegate_);
DCHECK(confirmation_callback_.is_null());
@@ -840,7 +840,7 @@ void BluetoothDeviceChromeOS::ConfirmModeChange(
void BluetoothDeviceChromeOS::Cancel() {
DCHECK(agent_.get());
- DVLOG(1) << "Cancel: " << address_;
+ VLOG(1) << "Cancel: " << address_;
DCHECK(pairing_delegate_);
pairing_delegate_->DismissDisplayOrConfirm();
generated by cgit v1.1 at 2025-03-09 03:14:12 +0000