chrome/browser/ui/ash/system_tray_delegate_chromeos.h - Issue 575653002: Revert of ash: Add checks for supervised users.

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.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/test/test_system_tray_delegate.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.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 CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_	5 #ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_

6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_	6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_

7	7

8 #include "ash/ime/input_method_menu_manager.h"	8 #include "ash/ime/input_method_menu_manager.h"

9 #include "ash/session/session_state_observer.h"	9 #include "ash/session/session_state_observer.h"

10 #include "ash/system/tray/system_tray.h"	10 #include "ash/system/tray/system_tray.h"

(...skipping 47 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
58 virtual void Initialize() OVERRIDE;	58 virtual void Initialize() OVERRIDE;

59 virtual void Shutdown() OVERRIDE;	59 virtual void Shutdown() OVERRIDE;

60 virtual bool GetTrayVisibilityOnStartup() OVERRIDE;	60 virtual bool GetTrayVisibilityOnStartup() OVERRIDE;

61 virtual ash::user::LoginStatus GetUserLoginStatus() const OVERRIDE;	61 virtual ash::user::LoginStatus GetUserLoginStatus() const OVERRIDE;

62 virtual void ChangeProfilePicture() OVERRIDE;	62 virtual void ChangeProfilePicture() OVERRIDE;

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

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

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

66 virtual const base::string16 GetSupervisedUserManagerName() const OVERRIDE;	66 virtual const base::string16 GetSupervisedUserManagerName() const OVERRIDE;

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

68 virtual bool IsUserSupervised() const OVERRIDE;

69 virtual bool SystemShouldUpgrade() const OVERRIDE;	68 virtual bool SystemShouldUpgrade() const OVERRIDE;

70 virtual base::HourClockType GetHourClockType() const OVERRIDE;	69 virtual base::HourClockType GetHourClockType() const OVERRIDE;

71 virtual void ShowSettings() OVERRIDE;	70 virtual void ShowSettings() OVERRIDE;

72 virtual bool ShouldShowSettings() OVERRIDE;	71 virtual bool ShouldShowSettings() OVERRIDE;

73 virtual void ShowDateSettings() OVERRIDE;	72 virtual void ShowDateSettings() OVERRIDE;

74 virtual void ShowSetTimeDialog() OVERRIDE;	73 virtual void ShowSetTimeDialog() OVERRIDE;

75 virtual void ShowNetworkSettings(const std::string& service_path) OVERRIDE;	74 virtual void ShowNetworkSettings(const std::string& service_path) OVERRIDE;

76 virtual void ShowBluetoothSettings() OVERRIDE;	75 virtual void ShowBluetoothSettings() OVERRIDE;

77 virtual void ShowDisplaySettings() OVERRIDE;	76 virtual void ShowDisplaySettings() OVERRIDE;

78 virtual void ShowChromeSlow() OVERRIDE;	77 virtual void ShowChromeSlow() OVERRIDE;

(...skipping 180 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
259 base::ScopedPtrHashMap<std::string, ash::tray::UserAccountsDelegate>	258 base::ScopedPtrHashMap<std::string, ash::tray::UserAccountsDelegate>

260 accounts_delegates_;	259 accounts_delegates_;

261	260

262 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);	261 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);

263 };	262 };

264	263

265 ash::SystemTrayDelegate* CreateSystemTrayDelegate();	264 ash::SystemTrayDelegate* CreateSystemTrayDelegate();

266	265

267 } // namespace chromeos	266 } // namespace chromeos

268 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_	267 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_

OLD	NEW