Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1192)

Side by Side Diff: ash/system/tray/default_system_tray_delegate.cc

Issue 2041233005: Moves ash::user::LoginStatus to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tweaks Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/session/session_state_delegate.h" 11 #include "ash/session/session_state_delegate.h"
12 #include "ash/shell.h" 12 #include "ash/shell.h"
13 #include "ash/volume_control_delegate.h" 13 #include "ash/volume_control_delegate.h"
14 #include "base/message_loop/message_loop.h" 14 #include "base/message_loop/message_loop.h"
15 #include "base/time/time.h" 15 #include "base/time/time.h"
16 16
17 namespace ash { 17 namespace ash {
18 18
19 DefaultSystemTrayDelegate::DefaultSystemTrayDelegate() 19 DefaultSystemTrayDelegate::DefaultSystemTrayDelegate()
20 : bluetooth_enabled_(true) { 20 : bluetooth_enabled_(true) {
21 } 21 }
22 22
23 DefaultSystemTrayDelegate::~DefaultSystemTrayDelegate() { 23 DefaultSystemTrayDelegate::~DefaultSystemTrayDelegate() {
24 } 24 }
25 25
26 bool DefaultSystemTrayDelegate::GetTrayVisibilityOnStartup() { 26 bool DefaultSystemTrayDelegate::GetTrayVisibilityOnStartup() {
27 return true; 27 return true;
28 } 28 }
29 29
30 user::LoginStatus DefaultSystemTrayDelegate::GetUserLoginStatus() const { 30 LoginStatus DefaultSystemTrayDelegate::GetUserLoginStatus() const {
31 return user::LOGGED_IN_USER; 31 return LoginStatus::USER;
32 } 32 }
33 33
34 std::string DefaultSystemTrayDelegate::GetSupervisedUserManager() const { 34 std::string DefaultSystemTrayDelegate::GetSupervisedUserManager() const {
35 if (!IsUserSupervised()) 35 if (!IsUserSupervised())
36 return std::string(); 36 return std::string();
37 return "manager@chrome.com"; 37 return "manager@chrome.com";
38 } 38 }
39 39
40 bool DefaultSystemTrayDelegate::IsUserSupervised() const { 40 bool DefaultSystemTrayDelegate::IsUserSupervised() const {
41 return GetUserLoginStatus() == ash::user::LOGGED_IN_SUPERVISED; 41 return GetUserLoginStatus() == LoginStatus::SUPERVISED;
42 } 42 }
43 43
44 void DefaultSystemTrayDelegate::GetSystemUpdateInfo(UpdateInfo* info) const { 44 void DefaultSystemTrayDelegate::GetSystemUpdateInfo(UpdateInfo* info) const {
45 DCHECK(info); 45 DCHECK(info);
46 info->severity = UpdateInfo::UPDATE_NORMAL; 46 info->severity = UpdateInfo::UPDATE_NORMAL;
47 info->update_required = true; 47 info->update_required = true;
48 info->factory_reset_required = false; 48 info->factory_reset_required = false;
49 } 49 }
50 50
51 bool DefaultSystemTrayDelegate::ShouldShowSettings() { 51 bool DefaultSystemTrayDelegate::ShouldShowSettings() {
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 std::unique_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
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698