Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(921)

Unified Diff: ash/common/system/chromeos/network/tray_vpn.cc

Issue 2696193002: Remove non-md code from tray_vpn.cc (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/system/chromeos/network/network_icon.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 =
« no previous file with comments | « ash/common/system/chromeos/network/network_icon.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698