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/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/networking_config_delegate.h" |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
75 bool DefaultSystemTrayDelegate::GetBluetoothDiscovering() { | 75 bool DefaultSystemTrayDelegate::GetBluetoothDiscovering() { |
76 return false; | 76 return false; |
77 } | 77 } |
78 | 78 |
79 VolumeControlDelegate* DefaultSystemTrayDelegate::GetVolumeControlDelegate() | 79 VolumeControlDelegate* DefaultSystemTrayDelegate::GetVolumeControlDelegate() |
80 const { | 80 const { |
81 return volume_control_delegate_.get(); | 81 return volume_control_delegate_.get(); |
82 } | 82 } |
83 | 83 |
84 void DefaultSystemTrayDelegate::SetVolumeControlDelegate( | 84 void DefaultSystemTrayDelegate::SetVolumeControlDelegate( |
85 scoped_ptr<VolumeControlDelegate> delegate) { | 85 std::unique_ptr<VolumeControlDelegate> delegate) { |
86 volume_control_delegate_ = std::move(delegate); | 86 volume_control_delegate_ = std::move(delegate); |
87 } | 87 } |
88 | 88 |
89 int DefaultSystemTrayDelegate::GetSystemTrayMenuWidth() { | 89 int DefaultSystemTrayDelegate::GetSystemTrayMenuWidth() { |
90 // This is the default width for English languages. | 90 // This is the default width for English languages. |
91 return 300; | 91 return 300; |
92 } | 92 } |
93 | 93 |
94 } // namespace ash | 94 } // namespace ash |
OLD | NEW |