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

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

Issue 2381493005: Add bluetooth device type icons on MD system tray. (Closed)
Patch Set: Rebase Created 4 years, 2 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 508 matching lines...) Expand 10 before | Expand all | Expand 10 after
519 device::BluetoothAdapter::DeviceList devices = 519 device::BluetoothAdapter::DeviceList devices =
520 bluetooth_adapter_->GetDevices(); 520 bluetooth_adapter_->GetDevices();
521 for (size_t i = 0; i < devices.size(); ++i) { 521 for (size_t i = 0; i < devices.size(); ++i) {
522 device::BluetoothDevice* device = devices[i]; 522 device::BluetoothDevice* device = devices[i];
523 ash::BluetoothDeviceInfo info; 523 ash::BluetoothDeviceInfo info;
524 info.address = device->GetAddress(); 524 info.address = device->GetAddress();
525 info.display_name = device->GetNameForDisplay(); 525 info.display_name = device->GetNameForDisplay();
526 info.connected = device->IsConnected(); 526 info.connected = device->IsConnected();
527 info.connecting = device->IsConnecting(); 527 info.connecting = device->IsConnecting();
528 info.paired = device->IsPaired(); 528 info.paired = device->IsPaired();
529 info.device_type = device->GetDeviceType();
529 list->push_back(info); 530 list->push_back(info);
530 } 531 }
531 } 532 }
532 533
533 void SystemTrayDelegateChromeOS::BluetoothStartDiscovering() { 534 void SystemTrayDelegateChromeOS::BluetoothStartDiscovering() {
534 if (GetBluetoothDiscovering()) { 535 if (GetBluetoothDiscovering()) {
535 LOG(WARNING) << "Already have active Bluetooth device discovery session."; 536 LOG(WARNING) << "Already have active Bluetooth device discovery session.";
536 return; 537 return;
537 } 538 }
538 VLOG(1) << "Requesting new Bluetooth device discovery session."; 539 VLOG(1) << "Requesting new Bluetooth device discovery session.";
(...skipping 672 matching lines...) Expand 10 before | Expand all | Expand 10 after
1211 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " 1212 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
1212 << "ENABLE_SUPERVISED_USERS undefined."; 1213 << "ENABLE_SUPERVISED_USERS undefined.";
1213 return base::string16(); 1214 return base::string16();
1214 } 1215 }
1215 1216
1216 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1217 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1217 return new SystemTrayDelegateChromeOS(); 1218 return new SystemTrayDelegateChromeOS();
1218 } 1219 }
1219 1220
1220 } // namespace chromeos 1221 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698