| Index: ash/common/system/chromeos/network/tray_vpn.cc
|
| diff --git a/ash/common/system/chromeos/network/tray_vpn.cc b/ash/common/system/chromeos/network/tray_vpn.cc
|
| index d24684ef2d97925139b056871da06a12735f8831..809308d619ffebd925a1becbcce375002d08daf8 100644
|
| --- a/ash/common/system/chromeos/network/tray_vpn.cc
|
| +++ b/ash/common/system/chromeos/network/tray_vpn.cc
|
| @@ -4,7 +4,6 @@
|
|
|
| #include "ash/common/system/chromeos/network/tray_vpn.h"
|
|
|
| -#include "ash/common/material_design/material_design_controller.h"
|
| #include "ash/common/session/session_state_delegate.h"
|
| #include "ash/common/system/chromeos/network/network_icon.h"
|
| #include "ash/common/system/chromeos/network/network_icon_animation.h"
|
| @@ -114,15 +113,11 @@ class VpnDefaultView : public TrayItemMore,
|
| NetworkHandler::Get()->network_state_handler();
|
| const NetworkState* vpn =
|
| handler->FirstNetworkByType(NetworkTypePattern::VPN());
|
| - if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
|
| - *image = gfx::CreateVectorIcon(
|
| - kNetworkVpnIcon, TrayPopupItemStyle::GetIconColor(
|
| - vpn && vpn->IsConnectedState()
|
| - ? TrayPopupItemStyle::ColorStyle::ACTIVE
|
| - : TrayPopupItemStyle::ColorStyle::INACTIVE));
|
| - } else {
|
| - *image = network_icon::GetVpnImage();
|
| - }
|
| + *image = gfx::CreateVectorIcon(
|
| + kNetworkVpnIcon, TrayPopupItemStyle::GetIconColor(
|
| + vpn && vpn->IsConnectedState()
|
| + ? TrayPopupItemStyle::ColorStyle::ACTIVE
|
| + : TrayPopupItemStyle::ColorStyle::INACTIVE));
|
| if (!IsVpnConnected()) {
|
| if (label) {
|
| *label =
|
|
|