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

Unified Diff: ash/system/chromeos/managed/tray_locally_managed_user.h

Issue 14507003: Add tray warning for Locally managed users. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix win-aura compile error Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/chromeos/label_tray_view.cc ('k') | ash/system/chromeos/managed/tray_locally_managed_user.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/managed/tray_locally_managed_user.h
diff --git a/ash/system/chromeos/enterprise/tray_enterprise.h b/ash/system/chromeos/managed/tray_locally_managed_user.h
similarity index 51%
copy from ash/system/chromeos/enterprise/tray_enterprise.h
copy to ash/system/chromeos/managed/tray_locally_managed_user.h
index 050c0f055c1d38c5b688d54d9b18c8befb1adfb5..17f24ba601e96c822c9e19f76315bb0b9050a221 100644
--- a/ash/system/chromeos/enterprise/tray_enterprise.h
+++ b/ash/system/chromeos/managed/tray_locally_managed_user.h
@@ -2,10 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SYSTEM_CHROMEOS_ENTERPRISE_TRAY_ENTERPRISE_H
-#define ASH_SYSTEM_CHROMEOS_ENTERPRISE_TRAY_ENTERPRISE_H
+#ifndef ASH_SYSTEM_CHROMEOS_LOCALLY_MANAGED_TRAY_LOCALLY_MANAGED_USER_H
+#define ASH_SYSTEM_CHROMEOS_LOCALLY_MANAGED_TRAY_LOCALLY_MANAGED_USER_H
-#include "ash/system/chromeos/enterprise/enterprise_domain_observer.h"
#include "ash/system/tray/system_tray_item.h"
#include "ash/system/tray/view_click_listener.h"
@@ -16,37 +15,33 @@ class SystemTray;
namespace ash {
namespace internal {
-class EnterpriseDefaultView;
+class LabelTrayView;
-class TrayEnterprise : public SystemTrayItem,
- public ViewClickListener,
- public EnterpriseDomainObserver {
+class TrayLocallyManagedUser : public SystemTrayItem,
+ public ViewClickListener {
public:
- explicit TrayEnterprise(SystemTray* system_tray);
- virtual ~TrayEnterprise();
+ explicit TrayLocallyManagedUser(SystemTray* system_tray);
+ virtual ~TrayLocallyManagedUser();
// If message is not empty updates content of default view, otherwise hides
// tray items.
- void UpdateEnterpriseMessage();
+ void UpdateMessage();
// Overridden from SystemTrayItem.
virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
virtual void DestroyDefaultView() OVERRIDE;
- // Overridden from EnterpriseDomainObserver.
- virtual void OnEnterpriseDomainChanged() OVERRIDE;
-
// Overridden from ViewClickListener.
virtual void OnViewClicked(views::View* sender) OVERRIDE;
private:
- EnterpriseDefaultView* default_view_;
+ LabelTrayView* tray_view_;
- DISALLOW_COPY_AND_ASSIGN(TrayEnterprise);
+ DISALLOW_COPY_AND_ASSIGN(TrayLocallyManagedUser);
};
} // namespace internal
} // namespace ash
-#endif // ASH_SYSTEM_CHROMEOS_ENTERPRISE_TRAY_ENTERPRISE_H
+#endif // ASH_SYSTEM_CHROMEOS_LOCALLY_MANAGED_TRAY_LOCALLY_MANAGED_USER_H
« no previous file with comments | « ash/system/chromeos/label_tray_view.cc ('k') | ash/system/chromeos/managed/tray_locally_managed_user.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698