| 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" |
| 11 #include "ash/shell.h" | 11 #include "ash/shell.h" |
| 12 #include "ash/volume_control_delegate.h" | 12 #include "ash/volume_control_delegate.h" |
| 13 #include "base/message_loop/message_loop.h" | 13 #include "base/message_loop/message_loop.h" |
| 14 #include "base/time/time.h" | 14 #include "base/time/time.h" |
| 15 | 15 |
| 16 namespace ash { | 16 namespace ash { |
| 17 | 17 |
| 18 DefaultSystemTrayDelegate::DefaultSystemTrayDelegate() | 18 DefaultSystemTrayDelegate::DefaultSystemTrayDelegate() |
| 19 : bluetooth_enabled_(true) { | 19 : bluetooth_enabled_(true) { |
| 20 } | 20 } |
| 21 | 21 |
| 22 DefaultSystemTrayDelegate::~DefaultSystemTrayDelegate() { | 22 DefaultSystemTrayDelegate::~DefaultSystemTrayDelegate() { |
| 23 } | 23 } |
| 24 | 24 |
| 25 bool DefaultSystemTrayDelegate::GetTrayVisibilityOnStartup() { | 25 bool DefaultSystemTrayDelegate::GetTrayVisibilityOnStartup() { |
| 26 return true; | 26 return true; |
| 27 } | 27 } |
| 28 | 28 |
| 29 user::LoginStatus DefaultSystemTrayDelegate::GetUserLoginStatus() const { | 29 LoginStatus DefaultSystemTrayDelegate::GetUserLoginStatus() const { |
| 30 return user::LOGGED_IN_USER; | 30 return LoginStatus::USER; |
| 31 } | 31 } |
| 32 | 32 |
| 33 std::string DefaultSystemTrayDelegate::GetSupervisedUserManager() const { | 33 std::string DefaultSystemTrayDelegate::GetSupervisedUserManager() const { |
| 34 if (!IsUserSupervised()) | 34 if (!IsUserSupervised()) |
| 35 return std::string(); | 35 return std::string(); |
| 36 return "manager@chrome.com"; | 36 return "manager@chrome.com"; |
| 37 } | 37 } |
| 38 | 38 |
| 39 bool DefaultSystemTrayDelegate::IsUserSupervised() const { | 39 bool DefaultSystemTrayDelegate::IsUserSupervised() const { |
| 40 return GetUserLoginStatus() == ash::user::LOGGED_IN_SUPERVISED; | 40 return GetUserLoginStatus() == LoginStatus::SUPERVISED; |
| 41 } | 41 } |
| 42 | 42 |
| 43 void DefaultSystemTrayDelegate::GetSystemUpdateInfo(UpdateInfo* info) const { | 43 void DefaultSystemTrayDelegate::GetSystemUpdateInfo(UpdateInfo* info) const { |
| 44 DCHECK(info); | 44 DCHECK(info); |
| 45 info->severity = UpdateInfo::UPDATE_NORMAL; | 45 info->severity = UpdateInfo::UPDATE_NORMAL; |
| 46 info->update_required = true; | 46 info->update_required = true; |
| 47 info->factory_reset_required = false; | 47 info->factory_reset_required = false; |
| 48 } | 48 } |
| 49 | 49 |
| 50 bool DefaultSystemTrayDelegate::ShouldShowSettings() { | 50 bool DefaultSystemTrayDelegate::ShouldShowSettings() { |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 std::unique_ptr<VolumeControlDelegate> delegate) { | 84 std::unique_ptr<VolumeControlDelegate> delegate) { |
| 85 volume_control_delegate_ = std::move(delegate); | 85 volume_control_delegate_ = std::move(delegate); |
| 86 } | 86 } |
| 87 | 87 |
| 88 int DefaultSystemTrayDelegate::GetSystemTrayMenuWidth() { | 88 int DefaultSystemTrayDelegate::GetSystemTrayMenuWidth() { |
| 89 // This is the default width for English languages. | 89 // This is the default width for English languages. |
| 90 return 300; | 90 return 300; |
| 91 } | 91 } |
| 92 | 92 |
| 93 } // namespace ash | 93 } // namespace ash |
| OLD | NEW |