| 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 | 8 |
| 9 #include "ash/session/session_state_delegate.h" | 9 #include "ash/session/session_state_delegate.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 | 83 |
| 84 const base::string16 DefaultSystemTrayDelegate::GetSupervisedUserMessage() | 84 const base::string16 DefaultSystemTrayDelegate::GetSupervisedUserMessage() |
| 85 const { | 85 const { |
| 86 return base::string16(); | 86 return base::string16(); |
| 87 } | 87 } |
| 88 | 88 |
| 89 bool DefaultSystemTrayDelegate::IsUserSupervised() const { | 89 bool DefaultSystemTrayDelegate::IsUserSupervised() const { |
| 90 return false; | 90 return false; |
| 91 } | 91 } |
| 92 | 92 |
| 93 bool DefaultSystemTrayDelegate::SystemShouldUpgrade() const { | 93 bool DefaultSystemTrayDelegate::SystemShouldUpgrade(UpdateInfo* info) const { |
| 94 if (info) { |
| 95 info->severity = UpdateInfo::UPDATE_NORMAL; |
| 96 info->is_factory_reset_required = false; |
| 97 } |
| 94 return true; | 98 return true; |
| 95 } | 99 } |
| 96 | 100 |
| 97 base::HourClockType DefaultSystemTrayDelegate::GetHourClockType() const { | 101 base::HourClockType DefaultSystemTrayDelegate::GetHourClockType() const { |
| 98 return base::k24HourClock; | 102 return base::k24HourClock; |
| 99 } | 103 } |
| 100 | 104 |
| 101 void DefaultSystemTrayDelegate::ShowSettings() { | 105 void DefaultSystemTrayDelegate::ShowSettings() { |
| 102 } | 106 } |
| 103 | 107 |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 bool DefaultSystemTrayDelegate::IsSearchKeyMappedToCapsLock() { | 286 bool DefaultSystemTrayDelegate::IsSearchKeyMappedToCapsLock() { |
| 283 return false; | 287 return false; |
| 284 } | 288 } |
| 285 | 289 |
| 286 tray::UserAccountsDelegate* DefaultSystemTrayDelegate::GetUserAccountsDelegate( | 290 tray::UserAccountsDelegate* DefaultSystemTrayDelegate::GetUserAccountsDelegate( |
| 287 const std::string& user_id) { | 291 const std::string& user_id) { |
| 288 return NULL; | 292 return NULL; |
| 289 } | 293 } |
| 290 | 294 |
| 291 } // namespace ash | 295 } // namespace ash |
| OLD | NEW |