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

Unified Diff: ash/common/system/chromeos/enterprise/tray_enterprise.cc

Issue 2715463004: Remove non-MD code from LabelTrayView (Closed)
Patch Set: estade comments Created 3 years, 9 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 | « no previous file | ash/common/system/chromeos/session/tray_session_length_limit.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/chromeos/enterprise/tray_enterprise.cc
diff --git a/ash/common/system/chromeos/enterprise/tray_enterprise.cc b/ash/common/system/chromeos/enterprise/tray_enterprise.cc
index e61304701af09447af7d9f804dc5c9adf40d42ee..aee40b76e279df199b811b0fac29e7fe4b8e9b05 100644
--- a/ash/common/system/chromeos/enterprise/tray_enterprise.cc
+++ b/ash/common/system/chromeos/enterprise/tray_enterprise.cc
@@ -8,7 +8,7 @@
#include "ash/common/system/tray/label_tray_view.h"
#include "ash/common/system/tray/system_tray_delegate.h"
#include "ash/common/system/tray/system_tray_notifier.h"
-#include "ash/resources/grit/ash_resources.h"
+#include "ash/resources/vector_icons/vector_icons.h"
#include "ash/shell.h"
#include "base/logging.h"
#include "base/strings/string16.h"
@@ -32,18 +32,18 @@ void TrayEnterprise::UpdateEnterpriseMessage() {
}
views::View* TrayEnterprise::CreateDefaultView(LoginStatus status) {
- CHECK(tray_view_ == NULL);
+ DCHECK(!tray_view_);
// For public accounts, enterprise ownership is indicated in the user details
// instead.
if (status == LoginStatus::PUBLIC)
- return NULL;
- tray_view_ = new LabelTrayView(this, IDR_AURA_UBER_TRAY_ENTERPRISE);
+ return nullptr;
+ tray_view_ = new LabelTrayView(this, kSystemMenuBusinessIcon);
UpdateEnterpriseMessage();
return tray_view_;
}
void TrayEnterprise::DestroyDefaultView() {
- tray_view_ = NULL;
+ tray_view_ = nullptr;
}
void TrayEnterprise::OnEnterpriseDomainChanged() {
« no previous file with comments | « no previous file | ash/common/system/chromeos/session/tray_session_length_limit.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698