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

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
« no previous file with comments | « ash/resources/vector_icons/system_menu_videocam.1x.icon ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 493 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 device::BluetoothAdapter::DeviceList devices = 504 device::BluetoothAdapter::DeviceList devices =
505 bluetooth_adapter_->GetDevices(); 505 bluetooth_adapter_->GetDevices();
506 for (size_t i = 0; i < devices.size(); ++i) { 506 for (size_t i = 0; i < devices.size(); ++i) {
507 device::BluetoothDevice* device = devices[i]; 507 device::BluetoothDevice* device = devices[i];
508 ash::BluetoothDeviceInfo info; 508 ash::BluetoothDeviceInfo info;
509 info.address = device->GetAddress(); 509 info.address = device->GetAddress();
510 info.display_name = device->GetNameForDisplay(); 510 info.display_name = device->GetNameForDisplay();
511 info.connected = device->IsConnected(); 511 info.connected = device->IsConnected();
512 info.connecting = device->IsConnecting(); 512 info.connecting = device->IsConnecting();
513 info.paired = device->IsPaired(); 513 info.paired = device->IsPaired();
514 info.device_type = device->GetDeviceType();
514 list->push_back(info); 515 list->push_back(info);
515 } 516 }
516 } 517 }
517 518
518 void SystemTrayDelegateChromeOS::BluetoothStartDiscovering() { 519 void SystemTrayDelegateChromeOS::BluetoothStartDiscovering() {
519 if (GetBluetoothDiscovering()) { 520 if (GetBluetoothDiscovering()) {
520 LOG(WARNING) << "Already have active Bluetooth device discovery session."; 521 LOG(WARNING) << "Already have active Bluetooth device discovery session.";
521 return; 522 return;
522 } 523 }
523 VLOG(1) << "Requesting new Bluetooth device discovery session."; 524 VLOG(1) << "Requesting new Bluetooth device discovery session.";
(...skipping 672 matching lines...) Expand 10 before | Expand all | Expand 10 after
1196 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " 1197 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
1197 << "ENABLE_SUPERVISED_USERS undefined."; 1198 << "ENABLE_SUPERVISED_USERS undefined.";
1198 return base::string16(); 1199 return base::string16();
1199 } 1200 }
1200 1201
1201 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1202 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1202 return new SystemTrayDelegateChromeOS(); 1203 return new SystemTrayDelegateChromeOS();
1203 } 1204 }
1204 1205
1205 } // namespace chromeos 1206 } // namespace chromeos
OLDNEW
« no previous file with comments | « ash/resources/vector_icons/system_menu_videocam.1x.icon ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698