| Index: chrome/browser/ui/ash/tray_bluetooth_helper.h
|
| diff --git a/chrome/browser/ui/ash/tray_bluetooth_helper.h b/chrome/browser/ui/ash/tray_bluetooth_helper.h
|
| index 10004b015534d24724103fbf91c4c20b27413f0a..1b18c371ca789daa521257b6bd795c43e97b4278 100644
|
| --- a/chrome/browser/ui/ash/tray_bluetooth_helper.h
|
| +++ b/chrome/browser/ui/ash/tray_bluetooth_helper.h
|
| @@ -17,10 +17,6 @@ namespace ash {
|
| struct BluetoothDeviceInfo;
|
| }
|
|
|
| -namespace chromeos {
|
| -class SystemTrayDelegateChromeOS;
|
| -}
|
| -
|
| namespace device {
|
| class BluetoothDiscoverySession;
|
| }
|
| @@ -32,8 +28,7 @@ class BluetoothDiscoverySession;
|
| // named "delegate" because long-term there should not be any delegation.
|
| class TrayBluetoothHelper : public device::BluetoothAdapter::Observer {
|
| public:
|
| - explicit TrayBluetoothHelper(
|
| - chromeos::SystemTrayDelegateChromeOS* system_tray_delegate);
|
| + TrayBluetoothHelper();
|
| ~TrayBluetoothHelper() override;
|
|
|
| // Called after SystemTray has been instantiated.
|
| @@ -91,10 +86,6 @@ class TrayBluetoothHelper : public device::BluetoothAdapter::Observer {
|
| void OnStartDiscoverySession(
|
| std::unique_ptr<device::BluetoothDiscoverySession> discovery_session);
|
|
|
| - // TODO: Eliminate this after verifying the initialization order of
|
| - // SystemTrayDelegateChromeOS can be changed.
|
| - chromeos::SystemTrayDelegateChromeOS* const system_tray_delegate_;
|
| -
|
| bool should_run_discovery_ = false;
|
| scoped_refptr<device::BluetoothAdapter> adapter_;
|
| std::unique_ptr<device::BluetoothDiscoverySession> discovery_session_;
|
|
|