Remove non-md code from tray_vpn.cc

ash/common/system/chromeos/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/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"
 #include "ash/common/system/chromeos/network/network_icon_animation_observer.h"
 #include "ash/common/system/chromeos/network/network_state_list_detailed_view.h"
 #include "ash/common/system/chromeos/network/vpn_list.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_item_more.h"
@@ skipping 89 matching lines @@
            (vpn->IsConnectedState() || vpn->IsConnectingState());
   }
 
   void GetNetworkStateHandlerImageAndLabel(gfx::ImageSkia* image,
                                            base::string16* label,
                                            bool* animating) {
     NetworkStateHandler* handler =
         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 =
             l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_VPN_DISCONNECTED);
       }
       *animating = false;
       return;
     }
     *animating = vpn->IsConnectingState();
     if (label) {
@@ skipping 65 matching lines @@
 void TrayVPN::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {}
 
 void TrayVPN::NetworkStateChanged() {
   if (default_)
     default_->Update();
   if (detailed_)
     detailed_->Update();
 }
 
 }  // namespace ash