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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.h

Issue 393343002: Rename "managed (mode|user)" to "supervised user" (part 7) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more alphabetize (and rebase again) Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/supervised_user/chromeos/supervised_user_password_service_factory.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #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 "apps/app_window_registry.h" 8 #include "apps/app_window_registry.h"
9 #include "ash/ime/input_method_menu_manager.h" 9 #include "ash/ime/input_method_menu_manager.h"
10 #include "ash/session/session_state_observer.h" 10 #include "ash/session/session_state_observer.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 scoped_refptr<device::BluetoothAdapter> adapter); 58 scoped_refptr<device::BluetoothAdapter> adapter);
59 59
60 // Overridden from ash::SystemTrayDelegate: 60 // Overridden from ash::SystemTrayDelegate:
61 virtual void Initialize() OVERRIDE; 61 virtual void Initialize() OVERRIDE;
62 virtual void Shutdown() OVERRIDE; 62 virtual void Shutdown() OVERRIDE;
63 virtual bool GetTrayVisibilityOnStartup() OVERRIDE; 63 virtual bool GetTrayVisibilityOnStartup() OVERRIDE;
64 virtual ash::user::LoginStatus GetUserLoginStatus() const OVERRIDE; 64 virtual ash::user::LoginStatus GetUserLoginStatus() const OVERRIDE;
65 virtual void ChangeProfilePicture() OVERRIDE; 65 virtual void ChangeProfilePicture() OVERRIDE;
66 virtual const std::string GetEnterpriseDomain() const OVERRIDE; 66 virtual const std::string GetEnterpriseDomain() const OVERRIDE;
67 virtual const base::string16 GetEnterpriseMessage() const OVERRIDE; 67 virtual const base::string16 GetEnterpriseMessage() const OVERRIDE;
68 virtual const std::string GetLocallyManagedUserManager() const OVERRIDE; 68 virtual const std::string GetSupervisedUserManager() const OVERRIDE;
69 virtual const base::string16 GetLocallyManagedUserManagerName() 69 virtual const base::string16 GetSupervisedUserManagerName() const OVERRIDE;
70 const OVERRIDE; 70 virtual const base::string16 GetSupervisedUserMessage() const OVERRIDE;
71 virtual const base::string16 GetLocallyManagedUserMessage() const OVERRIDE;
72 virtual bool SystemShouldUpgrade() const OVERRIDE; 71 virtual bool SystemShouldUpgrade() const OVERRIDE;
73 virtual base::HourClockType GetHourClockType() const OVERRIDE; 72 virtual base::HourClockType GetHourClockType() const OVERRIDE;
74 virtual void ShowSettings() OVERRIDE; 73 virtual void ShowSettings() OVERRIDE;
75 virtual bool ShouldShowSettings() OVERRIDE; 74 virtual bool ShouldShowSettings() OVERRIDE;
76 virtual void ShowDateSettings() OVERRIDE; 75 virtual void ShowDateSettings() OVERRIDE;
77 virtual void ShowSetTimeDialog() OVERRIDE; 76 virtual void ShowSetTimeDialog() OVERRIDE;
78 virtual void ShowNetworkSettings(const std::string& service_path) OVERRIDE; 77 virtual void ShowNetworkSettings(const std::string& service_path) OVERRIDE;
79 virtual void ShowBluetoothSettings() OVERRIDE; 78 virtual void ShowBluetoothSettings() OVERRIDE;
80 virtual void ShowDisplaySettings() OVERRIDE; 79 virtual void ShowDisplaySettings() OVERRIDE;
81 virtual void ShowChromeSlow() OVERRIDE; 80 virtual void ShowChromeSlow() OVERRIDE;
82 virtual bool ShouldShowDisplayNotification() OVERRIDE; 81 virtual bool ShouldShowDisplayNotification() OVERRIDE;
83 virtual void ShowDriveSettings() OVERRIDE; 82 virtual void ShowDriveSettings() OVERRIDE;
84 virtual void ShowIMESettings() OVERRIDE; 83 virtual void ShowIMESettings() OVERRIDE;
85 virtual void ShowHelp() OVERRIDE; 84 virtual void ShowHelp() OVERRIDE;
86 virtual void ShowAccessibilityHelp() OVERRIDE; 85 virtual void ShowAccessibilityHelp() OVERRIDE;
87 virtual void ShowAccessibilitySettings() OVERRIDE; 86 virtual void ShowAccessibilitySettings() OVERRIDE;
88 virtual void ShowPublicAccountInfo() OVERRIDE; 87 virtual void ShowPublicAccountInfo() OVERRIDE;
89 virtual void ShowLocallyManagedUserInfo() OVERRIDE; 88 virtual void ShowSupervisedUserInfo() OVERRIDE;
90 virtual void ShowEnterpriseInfo() OVERRIDE; 89 virtual void ShowEnterpriseInfo() OVERRIDE;
91 virtual void ShowUserLogin() OVERRIDE; 90 virtual void ShowUserLogin() OVERRIDE;
92 virtual bool ShowSpringChargerReplacementDialog() OVERRIDE; 91 virtual bool ShowSpringChargerReplacementDialog() OVERRIDE;
93 virtual bool IsSpringChargerReplacementDialogVisible() OVERRIDE; 92 virtual bool IsSpringChargerReplacementDialogVisible() OVERRIDE;
94 virtual bool HasUserConfirmedSafeSpringCharger() OVERRIDE; 93 virtual bool HasUserConfirmedSafeSpringCharger() OVERRIDE;
95 virtual void ShutDown() OVERRIDE; 94 virtual void ShutDown() OVERRIDE;
96 virtual void SignOut() OVERRIDE; 95 virtual void SignOut() OVERRIDE;
97 virtual void RequestLockScreen() OVERRIDE; 96 virtual void RequestLockScreen() OVERRIDE;
98 virtual void RequestRestartForUpdate() OVERRIDE; 97 virtual void RequestRestartForUpdate() OVERRIDE;
99 virtual void GetAvailableBluetoothDevices(ash::BluetoothDeviceList* list) 98 virtual void GetAvailableBluetoothDevices(ash::BluetoothDeviceList* list)
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 base::ScopedPtrHashMap<std::string, ash::tray::UserAccountsDelegate> 279 base::ScopedPtrHashMap<std::string, ash::tray::UserAccountsDelegate>
281 accounts_delegates_; 280 accounts_delegates_;
282 281
283 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 282 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
284 }; 283 };
285 284
286 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 285 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
287 286
288 } // namespace chromeos 287 } // namespace chromeos
289 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 288 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW
« no previous file with comments | « chrome/browser/supervised_user/chromeos/supervised_user_password_service_factory.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698