| OLD | NEW |
| 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 "ash/system/tray/default_system_tray_delegate.h" | 5 #include "ash/common/system/tray/default_system_tray_delegate.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "ash/networking_config_delegate.h" | 10 #include "ash/common/system/networking_config_delegate.h" |
| 11 #include "ash/shell.h" | 11 #include "ash/common/system/volume_control_delegate.h" |
| 12 #include "ash/volume_control_delegate.h" | |
| 13 #include "base/message_loop/message_loop.h" | 12 #include "base/message_loop/message_loop.h" |
| 14 #include "base/time/time.h" | 13 #include "base/time/time.h" |
| 15 | 14 |
| 16 namespace ash { | 15 namespace ash { |
| 17 | 16 |
| 18 DefaultSystemTrayDelegate::DefaultSystemTrayDelegate() | 17 DefaultSystemTrayDelegate::DefaultSystemTrayDelegate() |
| 19 : bluetooth_enabled_(true) { | 18 : bluetooth_enabled_(true) { |
| 20 } | 19 } |
| 21 | 20 |
| 22 DefaultSystemTrayDelegate::~DefaultSystemTrayDelegate() { | 21 DefaultSystemTrayDelegate::~DefaultSystemTrayDelegate() { |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 std::unique_ptr<VolumeControlDelegate> delegate) { | 83 std::unique_ptr<VolumeControlDelegate> delegate) { |
| 85 volume_control_delegate_ = std::move(delegate); | 84 volume_control_delegate_ = std::move(delegate); |
| 86 } | 85 } |
| 87 | 86 |
| 88 int DefaultSystemTrayDelegate::GetSystemTrayMenuWidth() { | 87 int DefaultSystemTrayDelegate::GetSystemTrayMenuWidth() { |
| 89 // This is the default width for English languages. | 88 // This is the default width for English languages. |
| 90 return 300; | 89 return 300; |
| 91 } | 90 } |
| 92 | 91 |
| 93 } // namespace ash | 92 } // namespace ash |
| OLD | NEW |