| 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/system/tray/system_tray_delegate.h" | 5 #include "ash/system/tray/system_tray_delegate.h" |
| 6 | 6 |
| 7 #include "ash/system/tray/test_system_tray_delegate.h" | 7 #include "ash/system/tray/test_system_tray_delegate.h" |
| 8 | 8 |
| 9 namespace ash { | 9 namespace ash { |
| 10 | 10 |
| 11 NetworkIconInfo::NetworkIconInfo() | 11 NetworkIconInfo::NetworkIconInfo() |
| 12 : connecting(false), | 12 : connecting(false), |
| 13 connected(false), | 13 connected(false), |
| 14 tray_icon_visible(true), | 14 tray_icon_visible(true), |
| 15 is_cellular(false) { | 15 is_cellular(false) { |
| 16 } | 16 } |
| 17 | 17 |
| 18 NetworkIconInfo::~NetworkIconInfo() { | 18 NetworkIconInfo::~NetworkIconInfo() { |
| 19 } | 19 } |
| 20 | 20 |
| 21 BluetoothDeviceInfo::BluetoothDeviceInfo() | 21 BluetoothDeviceInfo::BluetoothDeviceInfo() |
| 22 : connected(false) { | 22 : connected(false), |
| 23 connecting(false), |
| 24 paired(false), |
| 25 visible(false) { |
| 23 } | 26 } |
| 24 | 27 |
| 25 BluetoothDeviceInfo::~BluetoothDeviceInfo() { | 28 BluetoothDeviceInfo::~BluetoothDeviceInfo() { |
| 26 } | 29 } |
| 27 | 30 |
| 28 DriveOperationStatus::DriveOperationStatus() | 31 DriveOperationStatus::DriveOperationStatus() |
| 29 : progress(0.0), type(OPERATION_OTHER), state(OPERATION_NOT_STARTED) { | 32 : progress(0.0), type(OPERATION_OTHER), state(OPERATION_NOT_STARTED) { |
| 30 } | 33 } |
| 31 | 34 |
| 32 DriveOperationStatus::~DriveOperationStatus() { | 35 DriveOperationStatus::~DriveOperationStatus() { |
| (...skipping 15 matching lines...) Expand all Loading... |
| 48 } | 51 } |
| 49 | 52 |
| 50 // TODO(stevenjb/oshima): Remove this once Shell::delegate_ is guaranteed | 53 // TODO(stevenjb/oshima): Remove this once Shell::delegate_ is guaranteed |
| 51 // to not be NULL and move TestSystemTrayDelegate -> ash/test. crbug.com/159693 | 54 // to not be NULL and move TestSystemTrayDelegate -> ash/test. crbug.com/159693 |
| 52 // static | 55 // static |
| 53 SystemTrayDelegate* SystemTrayDelegate::CreateDummyDelegate() { | 56 SystemTrayDelegate* SystemTrayDelegate::CreateDummyDelegate() { |
| 54 return new test::TestSystemTrayDelegate; | 57 return new test::TestSystemTrayDelegate; |
| 55 } | 58 } |
| 56 | 59 |
| 57 } // namespace ash | 60 } // namespace ash |
| OLD | NEW |