OLD | NEW |
---|---|
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/common/system/chromeos/bluetooth/tray_bluetooth.h" | 5 #include "ash/common/system/chromeos/bluetooth/tray_bluetooth.h" |
6 | 6 |
7 #include "ash/common/session/session_state_delegate.h" | 7 #include "ash/common/session/session_state_delegate.h" |
8 #include "ash/common/system/tray/fixed_sized_scroll_view.h" | 8 #include "ash/common/system/tray/fixed_sized_scroll_view.h" |
9 #include "ash/common/system/tray/hover_highlight_view.h" | 9 #include "ash/common/system/tray/hover_highlight_view.h" |
10 #include "ash/common/system/tray/system_tray.h" | 10 #include "ash/common/system/tray/system_tray.h" |
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
387 BluetoothDeviceList connecting_devices_; | 387 BluetoothDeviceList connecting_devices_; |
388 BluetoothDeviceList paired_not_connected_devices_; | 388 BluetoothDeviceList paired_not_connected_devices_; |
389 BluetoothDeviceList discovered_not_paired_devices_; | 389 BluetoothDeviceList discovered_not_paired_devices_; |
390 | 390 |
391 DISALLOW_COPY_AND_ASSIGN(BluetoothDetailedView); | 391 DISALLOW_COPY_AND_ASSIGN(BluetoothDetailedView); |
392 }; | 392 }; |
393 | 393 |
394 } // namespace tray | 394 } // namespace tray |
395 | 395 |
396 TrayBluetooth::TrayBluetooth(SystemTray* system_tray) | 396 TrayBluetooth::TrayBluetooth(SystemTray* system_tray) |
397 : SystemTrayItem(system_tray), default_(NULL), detailed_(NULL) { | 397 : SystemTrayItem(system_tray, BLUETOOTH), default_(NULL), detailed_(NULL) { |
James Cook
2016/07/20 20:13:49
nit: nullptr while you're here
bruthig
2016/07/21 14:34:58
Done.
| |
398 WmShell::Get()->system_tray_notifier()->AddBluetoothObserver(this); | 398 WmShell::Get()->system_tray_notifier()->AddBluetoothObserver(this); |
399 } | 399 } |
400 | 400 |
401 TrayBluetooth::~TrayBluetooth() { | 401 TrayBluetooth::~TrayBluetooth() { |
402 WmShell::Get()->system_tray_notifier()->RemoveBluetoothObserver(this); | 402 WmShell::Get()->system_tray_notifier()->RemoveBluetoothObserver(this); |
403 } | 403 } |
404 | 404 |
405 views::View* TrayBluetooth::CreateTrayView(LoginStatus status) { | 405 views::View* TrayBluetooth::CreateTrayView(LoginStatus status) { |
406 return NULL; | 406 return NULL; |
407 } | 407 } |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
443 detailed_->Update(); | 443 detailed_->Update(); |
444 } | 444 } |
445 | 445 |
446 void TrayBluetooth::OnBluetoothDiscoveringChanged() { | 446 void TrayBluetooth::OnBluetoothDiscoveringChanged() { |
447 if (!detailed_) | 447 if (!detailed_) |
448 return; | 448 return; |
449 detailed_->Update(); | 449 detailed_->Update(); |
450 } | 450 } |
451 | 451 |
452 } // namespace ash | 452 } // namespace ash |
OLD | NEW |