| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" | 5 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 590 device::BluetoothAdapter::DeviceList devices = | 590 device::BluetoothAdapter::DeviceList devices = |
| 591 bluetooth_adapter_->GetDevices(); | 591 bluetooth_adapter_->GetDevices(); |
| 592 for (size_t i = 0; i < devices.size(); ++i) { | 592 for (size_t i = 0; i < devices.size(); ++i) { |
| 593 device::BluetoothDevice* device = devices[i]; | 593 device::BluetoothDevice* device = devices[i]; |
| 594 ash::BluetoothDeviceInfo info; | 594 ash::BluetoothDeviceInfo info; |
| 595 info.address = device->GetAddress(); | 595 info.address = device->GetAddress(); |
| 596 info.display_name = device->GetNameForDisplay(); | 596 info.display_name = device->GetNameForDisplay(); |
| 597 info.connected = device->IsConnected(); | 597 info.connected = device->IsConnected(); |
| 598 info.connecting = device->IsConnecting(); | 598 info.connecting = device->IsConnecting(); |
| 599 info.paired = device->IsPaired(); | 599 info.paired = device->IsPaired(); |
| 600 info.device_type = device->GetDeviceType(); |
| 600 list->push_back(info); | 601 list->push_back(info); |
| 601 } | 602 } |
| 602 } | 603 } |
| 603 | 604 |
| 604 void SystemTrayDelegateChromeOS::BluetoothStartDiscovering() { | 605 void SystemTrayDelegateChromeOS::BluetoothStartDiscovering() { |
| 605 if (GetBluetoothDiscovering()) { | 606 if (GetBluetoothDiscovering()) { |
| 606 LOG(WARNING) << "Already have active Bluetooth device discovery session."; | 607 LOG(WARNING) << "Already have active Bluetooth device discovery session."; |
| 607 return; | 608 return; |
| 608 } | 609 } |
| 609 VLOG(1) << "Requesting new Bluetooth device discovery session."; | 610 VLOG(1) << "Requesting new Bluetooth device discovery session."; |
| (...skipping 689 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1299 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " | 1300 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " |
| 1300 << "ENABLE_SUPERVISED_USERS undefined."; | 1301 << "ENABLE_SUPERVISED_USERS undefined."; |
| 1301 return base::string16(); | 1302 return base::string16(); |
| 1302 } | 1303 } |
| 1303 | 1304 |
| 1304 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 1305 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
| 1305 return new SystemTrayDelegateChromeOS(); | 1306 return new SystemTrayDelegateChromeOS(); |
| 1306 } | 1307 } |
| 1307 | 1308 |
| 1308 } // namespace chromeos | 1309 } // namespace chromeos |
| OLD | NEW |