| Index: ash/system/network/tray_vpn.cc
|
| diff --git a/ash/system/network/tray_vpn.cc b/ash/system/network/tray_vpn.cc
|
| index 23a766d1121d91de96ae842b4a39618bca67953a..f6a9f9d73a0d315515424550f50a4f0c90f015ec 100644
|
| --- a/ash/system/network/tray_vpn.cc
|
| +++ b/ash/system/network/tray_vpn.cc
|
| @@ -148,18 +148,14 @@ TrayVPN::TrayVPN(SystemTray* system_tray)
|
|
|
| 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();
|
| @@ -172,9 +168,9 @@ views::View* TrayVPN::CreateDefaultView(LoginStatus status) {
|
| }
|
|
|
| views::View* TrayVPN::CreateDetailedView(LoginStatus status) {
|
| - CHECK(detailed_ == NULL);
|
| + CHECK(detailed_ == nullptr);
|
| if (!chromeos::NetworkHandler::IsInitialized())
|
| - return NULL;
|
| + return nullptr;
|
|
|
| WmShell::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_DETAILED_VPN_VIEW);
|
| detailed_ = new tray::NetworkStateListDetailedView(
|
| @@ -183,20 +179,14 @@ views::View* TrayVPN::CreateDetailedView(LoginStatus status) {
|
| 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();
|
|
|