| 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 | 9 |
| 9 #include "ash/networking_config_delegate.h" | 10 #include "ash/networking_config_delegate.h" |
| 10 #include "ash/session/session_state_delegate.h" | 11 #include "ash/session/session_state_delegate.h" |
| 11 #include "ash/shell.h" | 12 #include "ash/shell.h" |
| 12 #include "ash/volume_control_delegate.h" | 13 #include "ash/volume_control_delegate.h" |
| 13 #include "base/message_loop/message_loop.h" | 14 #include "base/message_loop/message_loop.h" |
| 14 #include "base/time/time.h" | 15 #include "base/time/time.h" |
| 15 | 16 |
| 16 namespace ash { | 17 namespace ash { |
| 17 | 18 |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 return false; | 76 return false; |
| 76 } | 77 } |
| 77 | 78 |
| 78 VolumeControlDelegate* DefaultSystemTrayDelegate::GetVolumeControlDelegate() | 79 VolumeControlDelegate* DefaultSystemTrayDelegate::GetVolumeControlDelegate() |
| 79 const { | 80 const { |
| 80 return volume_control_delegate_.get(); | 81 return volume_control_delegate_.get(); |
| 81 } | 82 } |
| 82 | 83 |
| 83 void DefaultSystemTrayDelegate::SetVolumeControlDelegate( | 84 void DefaultSystemTrayDelegate::SetVolumeControlDelegate( |
| 84 scoped_ptr<VolumeControlDelegate> delegate) { | 85 scoped_ptr<VolumeControlDelegate> delegate) { |
| 85 volume_control_delegate_ = delegate.Pass(); | 86 volume_control_delegate_ = std::move(delegate); |
| 86 } | 87 } |
| 87 | 88 |
| 88 int DefaultSystemTrayDelegate::GetSystemTrayMenuWidth() { | 89 int DefaultSystemTrayDelegate::GetSystemTrayMenuWidth() { |
| 89 // This is the default width for English languages. | 90 // This is the default width for English languages. |
| 90 return 300; | 91 return 300; |
| 91 } | 92 } |
| 92 | 93 |
| 93 } // namespace ash | 94 } // namespace ash |
| OLD | NEW |