Remove non-MD code from LabelTrayView

ash/common/system/chromeos/session/tray_session_length_limit.cc

 // Copyright 2014 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/session/tray_session_length_limit.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 
 #include "ash/common/system/system_notifier.h"
 #include "ash/common/system/tray/label_tray_view.h"
 #include "ash/common/system/tray/system_tray.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/utf_string_conversions.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/time_format.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification.h"
 #include "ui/views/view.h"
 
@@ skipping 12 matching lines @@
 }  // namespace
 
 // static
 const char TraySessionLengthLimit::kNotificationId[] =
     "chrome://session/timeout";
 
 TraySessionLengthLimit::TraySessionLengthLimit(SystemTray* system_tray)
     : SystemTrayItem(system_tray, UMA_SESSION_LENGTH_LIMIT),
       limit_state_(LIMIT_NONE),
       last_limit_state_(LIMIT_NONE),
-      tray_bubble_view_(NULL) {
+      tray_bubble_view_(nullptr) {
   WmShell::Get()->system_tray_notifier()->AddSessionLengthLimitObserver(this);
   Update();
 }
 
 TraySessionLengthLimit::~TraySessionLengthLimit() {
   WmShell::Get()->system_tray_notifier()->RemoveSessionLengthLimitObserver(
       this);
 }
 
 // Add view to tray bubble.
 views::View* TraySessionLengthLimit::CreateDefaultView(LoginStatus status) {
   CHECK(!tray_bubble_view_);
   UpdateState();
   if (limit_state_ == LIMIT_NONE)
-    return NULL;
-  tray_bubble_view_ =
-      new LabelTrayView(NULL /* click_listener */,
-                        IDR_AURA_UBER_TRAY_BUBBLE_SESSION_LENGTH_LIMIT);
+    return nullptr;
+  tray_bubble_view_ = new LabelTrayView(nullptr, kSystemMenuTimerIcon);
   tray_bubble_view_->SetMessage(ComposeTrayBubbleMessage());
   return tray_bubble_view_;
 }
 
 // View has been removed from tray bubble.
 void TraySessionLengthLimit::DestroyDefaultView() {
-  tray_bubble_view_ = NULL;
+  tray_bubble_view_ = nullptr;
 }
 
 void TraySessionLengthLimit::OnSessionStartTimeChanged() {
   Update();
 }
 
 void TraySessionLengthLimit::OnSessionLengthLimitChanged() {
   Update();
 }
 
@@ skipping 64 matching lines @@
       new message_center::Notification(
           message_center::NOTIFICATION_TYPE_SIMPLE, kNotificationId,
           base::string16() /* title */,
           ComposeNotificationMessage() /* message */,
           bundle.GetImageNamed(
               IDR_AURA_UBER_TRAY_NOTIFICATION_SESSION_LENGTH_LIMIT),
           base::string16() /* display_source */, GURL(),
           message_center::NotifierId(
               message_center::NotifierId::SYSTEM_COMPONENT,
               system_notifier::kNotifierSessionLengthTimeout),
-          data, NULL /* delegate */));
+          data, nullptr /* delegate */));
   notification->SetSystemPriority();
   if (message_center->FindVisibleNotificationById(kNotificationId))
     message_center->UpdateNotification(kNotificationId,
                                        std::move(notification));
   else
     message_center->AddNotification(std::move(notification));
   last_limit_state_ = limit_state_;
 }
 
 void TraySessionLengthLimit::UpdateTrayBubbleView() const {
@@ skipping 16 matching lines @@
 
 base::string16 TraySessionLengthLimit::ComposeTrayBubbleMessage() const {
   return l10n_util::GetStringFUTF16(
       IDS_ASH_STATUS_TRAY_BUBBLE_SESSION_LENGTH_LIMIT,
       ui::TimeFormat::Detailed(ui::TimeFormat::FORMAT_DURATION,
                                ui::TimeFormat::LENGTH_LONG, 10,
                                remaining_session_time_));
 }
 
 }  // namespace ash