ash/system/tray/default_system_tray_delegate.h - Issue 575653002: Revert of ash: Add checks for supervised users.

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

Issue 575653002: Revert of ash: Add checks for supervised users. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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

« no previous file with comments | « ash/system/chromeos/supervised/tray_supervised_user.cc ('k') | ash/system/tray/default_system_tray_delegate.cc » ('j') | no next file with comments »

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 #ifndef ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_	5 #ifndef ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_

6 #define ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_	6 #define ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_

7	7

8 #include "ash/ash_export.h"	8 #include "ash/ash_export.h"

9 #include "ash/system/tray/system_tray_delegate.h"	9 #include "ash/system/tray/system_tray_delegate.h"

10 #include "base/compiler_specific.h"	10 #include "base/compiler_specific.h"

(...skipping 11 matching lines...) Expand all Loading...
22 virtual void Shutdown() OVERRIDE;	22 virtual void Shutdown() OVERRIDE;

23 virtual bool GetTrayVisibilityOnStartup() OVERRIDE;	23 virtual bool GetTrayVisibilityOnStartup() OVERRIDE;

24 virtual user::LoginStatus GetUserLoginStatus() const OVERRIDE;	24 virtual user::LoginStatus GetUserLoginStatus() const OVERRIDE;

25 virtual void ChangeProfilePicture() OVERRIDE;	25 virtual void ChangeProfilePicture() OVERRIDE;

26 virtual const std::string GetEnterpriseDomain() const OVERRIDE;	26 virtual const std::string GetEnterpriseDomain() const OVERRIDE;

27 virtual const base::string16 GetEnterpriseMessage() const OVERRIDE;	27 virtual const base::string16 GetEnterpriseMessage() const OVERRIDE;

28 virtual const std::string GetSupervisedUserManager() const OVERRIDE;	28 virtual const std::string GetSupervisedUserManager() const OVERRIDE;

29 virtual const base::string16 GetSupervisedUserManagerName() const	29 virtual const base::string16 GetSupervisedUserManagerName() const

30 OVERRIDE;	30 OVERRIDE;

31 virtual const base::string16 GetSupervisedUserMessage() const OVERRIDE;	31 virtual const base::string16 GetSupervisedUserMessage() const OVERRIDE;

32 virtual bool IsUserSupervised() const OVERRIDE;

33 virtual bool SystemShouldUpgrade() const OVERRIDE;	32 virtual bool SystemShouldUpgrade() const OVERRIDE;

34 virtual base::HourClockType GetHourClockType() const OVERRIDE;	33 virtual base::HourClockType GetHourClockType() const OVERRIDE;

35 virtual void ShowSettings() OVERRIDE;	34 virtual void ShowSettings() OVERRIDE;

36 virtual bool ShouldShowSettings() OVERRIDE;	35 virtual bool ShouldShowSettings() OVERRIDE;

37 virtual void ShowDateSettings() OVERRIDE;	36 virtual void ShowDateSettings() OVERRIDE;

38 virtual void ShowSetTimeDialog() OVERRIDE;	37 virtual void ShowSetTimeDialog() OVERRIDE;

39 virtual void ShowNetworkSettings(const std::string& service_path) OVERRIDE;	38 virtual void ShowNetworkSettings(const std::string& service_path) OVERRIDE;

40 virtual void ShowBluetoothSettings() OVERRIDE;	39 virtual void ShowBluetoothSettings() OVERRIDE;

41 virtual void ShowDisplaySettings() OVERRIDE;	40 virtual void ShowDisplaySettings() OVERRIDE;

42 virtual void ShowChromeSlow() OVERRIDE;	41 virtual void ShowChromeSlow() OVERRIDE;

(...skipping 52 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
95 private:	94 private:

96 bool bluetooth_enabled_;	95 bool bluetooth_enabled_;

97 scoped_ptr<VolumeControlDelegate> volume_control_delegate_;	96 scoped_ptr<VolumeControlDelegate> volume_control_delegate_;

98	97

99 DISALLOW_COPY_AND_ASSIGN(DefaultSystemTrayDelegate);	98 DISALLOW_COPY_AND_ASSIGN(DefaultSystemTrayDelegate);

100 };	99 };

101	100

102 } // namespace ash	101 } // namespace ash

103	102

104 #endif // ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_	103 #endif // ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_

OLD	NEW