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

Side by Side Diff: ash/system/tray/system_tray_delegate.cc

Issue 1931563002: Add Bluetooth device type icons on the device list in system tray. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase / Removes ash::BluetoothDeviceInfo::DeviceType and uses existing device::BluetoothDevice::De… Created 4 years, 7 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ash/system/tray/system_tray_delegate.h" 5 #include "ash/system/tray/system_tray_delegate.h"
6 6
7 namespace ash { 7 namespace ash {
8 8
9 NetworkIconInfo::NetworkIconInfo() 9 NetworkIconInfo::NetworkIconInfo()
10 : connecting(false), 10 : connecting(false),
11 connected(false), 11 connected(false),
12 tray_icon_visible(true), 12 tray_icon_visible(true),
13 is_cellular(false) { 13 is_cellular(false) {
14 } 14 }
15 15
16 NetworkIconInfo::~NetworkIconInfo() { 16 NetworkIconInfo::~NetworkIconInfo() {
17 } 17 }
18 18
19 #if defined(OS_CHROMEOS)
19 BluetoothDeviceInfo::BluetoothDeviceInfo() 20 BluetoothDeviceInfo::BluetoothDeviceInfo()
20 : connected(false), connecting(false), paired(false) { 21 : device_type(device::BluetoothDevice::DEVICE_UNKNOWN),
21 } 22 connected(false),
23 connecting(false),
24 paired(false) {}
25
26 BluetoothDeviceInfo::BluetoothDeviceInfo(const BluetoothDeviceInfo& other) =
27 default;
22 28
23 BluetoothDeviceInfo::~BluetoothDeviceInfo() { 29 BluetoothDeviceInfo::~BluetoothDeviceInfo() {
24 } 30 }
31 #endif
25 32
26 IMEInfo::IMEInfo() : selected(false), third_party(false) { 33 IMEInfo::IMEInfo() : selected(false), third_party(false) {
27 } 34 }
28 35
29 IMEInfo::IMEInfo(const IMEInfo& other) = default; 36 IMEInfo::IMEInfo(const IMEInfo& other) = default;
30 37
31 IMEInfo::~IMEInfo() { 38 IMEInfo::~IMEInfo() {
32 } 39 }
33 40
34 IMEPropertyInfo::IMEPropertyInfo() : selected(false) { 41 IMEPropertyInfo::IMEPropertyInfo() : selected(false) {
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 286
280 void SystemTrayDelegate::ShouldRebootOnShutdown( 287 void SystemTrayDelegate::ShouldRebootOnShutdown(
281 const RebootOnShutdownCallback& callback) { 288 const RebootOnShutdownCallback& callback) {
282 } 289 }
283 290
284 VPNDelegate* SystemTrayDelegate::GetVPNDelegate() const { 291 VPNDelegate* SystemTrayDelegate::GetVPNDelegate() const {
285 return nullptr; 292 return nullptr;
286 } 293 }
287 294
288 } // namespace ash 295 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray_delegate.h ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698