Remove non-MD code from LabelTrayView

ash/common/system/chromeos/enterprise/tray_enterprise.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/system/chromeos/enterprise/tray_enterprise.h"
 
 #include "ash/common/login_status.h"
 #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/common/wm_shell.h"
-#include "ash/resources/grit/ash_resources.h"
+#include "ash/resources/vector_icons/vector_icons.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
 
 namespace ash {
 
 TrayEnterprise::TrayEnterprise(SystemTray* system_tray)
     : SystemTrayItem(system_tray, UMA_ENTERPRISE), tray_view_(nullptr) {
   WmShell::Get()->system_tray_notifier()->AddEnterpriseDomainObserver(this);
 }
 
 TrayEnterprise::~TrayEnterprise() {
   WmShell::Get()->system_tray_notifier()->RemoveEnterpriseDomainObserver(this);
 }
 
 void TrayEnterprise::UpdateEnterpriseMessage() {
   base::string16 message =
       WmShell::Get()->system_tray_delegate()->GetEnterpriseMessage();
   if (tray_view_)
     tray_view_->SetMessage(message);
 }
 
 views::View* TrayEnterprise::CreateDefaultView(LoginStatus status) {
-  CHECK(tray_view_ == NULL);
+  CHECK(!tray_view_);

[Evan Stade, 2017/02/22 21:43:46]

nit: DCHECK

[tdanderson, 2017/03/30 14:51:39]

Done.

   // 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() {

[Evan Stade, 2017/02/22 21:43:46]

aside: it seems like this should be called DefaultViewDestroyed since you don't
actually own the default view. Alternately we could do
tray_view_->set_owned_by_client() and actually destroy it here so that this
function name makes sense, but I think changing the function name to match
behavior is better than vice versa.

I assume this pattern is the same everywhere we have a tray item overriding
Destroy*View().

[tdanderson, 2017/03/30 14:51:39]

Yes, agreed. Filed https://bugs.chromium.org/p/chromium/issues/detail?id=706821
to track that.
I believe it is, yes.

-  tray_view_ = NULL;
+  tray_view_ = nullptr;
 }
 
 void TrayEnterprise::OnEnterpriseDomainChanged() {
   UpdateEnterpriseMessage();
 }
 
 void TrayEnterprise::OnViewClicked(views::View* sender) {
   WmShell::Get()->system_tray_delegate()->ShowEnterpriseInfo();
 }
 
 }  // namespace ash