Make LogoutButtonTray a regular View

ash/system/network/tray_vpn.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/system/network/tray_vpn.h"
 
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/session/session_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
@@ skipping 130 matching lines @@
 
 TrayVPN::TrayVPN(SystemTray* system_tray)
     : SystemTrayItem(system_tray, UMA_VPN),
       default_(nullptr),
       detailed_(nullptr) {
   network_state_observer_.reset(new TrayNetworkStateObserver(this));
 }
 
 TrayVPN::~TrayVPN() {}
 
-views::View* TrayVPN::CreateTrayView(LoginStatus status) {
-  return NULL;
-}
-
 views::View* TrayVPN::CreateDefaultView(LoginStatus status) {
-  CHECK(default_ == NULL);
+  CHECK(default_ == nullptr);
   if (!chromeos::NetworkHandler::IsInitialized())
-    return NULL;
+    return nullptr;
   if (status == LoginStatus::NOT_LOGGED_IN)
-    return NULL;
+    return nullptr;
   if (!tray::VpnDefaultView::ShouldShow())
-    return NULL;
+    return nullptr;
 
   const bool is_in_secondary_login_screen =
       Shell::Get()->session_controller()->IsInSecondaryLoginScreen();
 
   default_ = new tray::VpnDefaultView(this);
   default_->SetEnabled(status != LoginStatus::LOCKED &&
                        !is_in_secondary_login_screen);
 
   return default_;
 }
 
 views::View* TrayVPN::CreateDetailedView(LoginStatus status) {
-  CHECK(detailed_ == NULL);
+  CHECK(detailed_ == nullptr);
   if (!chromeos::NetworkHandler::IsInitialized())
-    return NULL;
+    return nullptr;
 
   ShellPort::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_DETAILED_VPN_VIEW);
   detailed_ = new tray::NetworkStateListDetailedView(
       this, tray::NetworkStateListDetailedView::LIST_TYPE_VPN, status);
   detailed_->Init();
   return detailed_;
 }
 
-void TrayVPN::DestroyTrayView() {}
-
 void TrayVPN::DestroyDefaultView() {
-  default_ = NULL;
+  default_ = nullptr;
 }
 
 void TrayVPN::DestroyDetailedView() {
-  detailed_ = NULL;
+  detailed_ = nullptr;
 }
 
-void TrayVPN::UpdateAfterLoginStatusChange(LoginStatus status) {}
-
-void TrayVPN::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {}
-
 void TrayVPN::NetworkStateChanged() {
   if (default_)
     default_->Update();
   if (detailed_)
     detailed_->Update();
 }
 
 }  // namespace ash