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

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 2017393002: bluetooth: Rename device's GetName to GetNameForDisplay (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 unified diff | Download patch
OLDNEW
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 608 matching lines...) Expand 10 before | Expand all | Expand 10 after
619 } 619 }
620 620
621 void SystemTrayDelegateChromeOS::GetAvailableBluetoothDevices( 621 void SystemTrayDelegateChromeOS::GetAvailableBluetoothDevices(
622 ash::BluetoothDeviceList* list) { 622 ash::BluetoothDeviceList* list) {
623 device::BluetoothAdapter::DeviceList devices = 623 device::BluetoothAdapter::DeviceList devices =
624 bluetooth_adapter_->GetDevices(); 624 bluetooth_adapter_->GetDevices();
625 for (size_t i = 0; i < devices.size(); ++i) { 625 for (size_t i = 0; i < devices.size(); ++i) {
626 device::BluetoothDevice* device = devices[i]; 626 device::BluetoothDevice* device = devices[i];
627 ash::BluetoothDeviceInfo info; 627 ash::BluetoothDeviceInfo info;
628 info.address = device->GetAddress(); 628 info.address = device->GetAddress();
629 info.display_name = device->GetName(); 629 info.display_name = device->GetNameForDisplay();
630 info.connected = device->IsConnected(); 630 info.connected = device->IsConnected();
631 info.connecting = device->IsConnecting(); 631 info.connecting = device->IsConnecting();
632 info.paired = device->IsPaired(); 632 info.paired = device->IsPaired();
633 list->push_back(info); 633 list->push_back(info);
634 } 634 }
635 } 635 }
636 636
637 void SystemTrayDelegateChromeOS::BluetoothStartDiscovering() { 637 void SystemTrayDelegateChromeOS::BluetoothStartDiscovering() {
638 if (GetBluetoothDiscovering()) { 638 if (GetBluetoothDiscovering()) {
639 LOG(WARNING) << "Already have active Bluetooth device discovery session."; 639 LOG(WARNING) << "Already have active Bluetooth device discovery session.";
(...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after
1331 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " 1331 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
1332 << "ENABLE_SUPERVISED_USERS undefined."; 1332 << "ENABLE_SUPERVISED_USERS undefined.";
1333 return base::string16(); 1333 return base::string16();
1334 } 1334 }
1335 1335
1336 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1336 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1337 return new SystemTrayDelegateChromeOS(); 1337 return new SystemTrayDelegateChromeOS();
1338 } 1338 }
1339 1339
1340 } // namespace chromeos 1340 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698