Modify TrayItemMore to use enabled status

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/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"
@@ skipping 17 matching lines @@
 using chromeos::NetworkState;
 using chromeos::NetworkStateHandler;
 using chromeos::NetworkTypePattern;
 
 namespace ash {
 namespace tray {
 
 class VpnDefaultView : public TrayItemMore,
                        public network_icon::AnimationObserver {
  public:
-  VpnDefaultView(SystemTrayItem* owner, bool show_more)
-      : TrayItemMore(owner, show_more) {}
+  explicit VpnDefaultView(SystemTrayItem* owner) : TrayItemMore(owner) {}
 
   ~VpnDefaultView() override {
     network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
   }
 
   static bool ShouldShow() {
     // Show the VPN entry in the ash tray bubble if at least one third-party VPN
     // provider is installed.
     if (WmShell::Get()->vpn_list()->HaveThirdPartyVPNProviders())
       return true;
@@ skipping 18 matching lines @@
     SetImage(image);
     SetLabel(label);
     SetAccessibleName(label);
   }
 
   // network_icon::AnimationObserver
   void NetworkIconChanged() override { Update(); }
 
  protected:
   // TrayItemMore:
-  std::unique_ptr<TrayPopupItemStyle> CreateStyle() const override {
-    std::unique_ptr<TrayPopupItemStyle> style = TrayItemMore::CreateStyle();
+  std::unique_ptr<TrayPopupItemStyle> HandleCreateStyle() const override {
+    std::unique_ptr<TrayPopupItemStyle> style =
+        TrayItemMore::HandleCreateStyle();
     style->set_color_style(
         !IsVpnEnabled()
             ? TrayPopupItemStyle::ColorStyle::DISABLED
             : IsVpnConnected() ? TrayPopupItemStyle::ColorStyle::ACTIVE
                                : TrayPopupItemStyle::ColorStyle::INACTIVE);
     return style;
   }
 
   void UpdateStyle() override {
     TrayItemMore::UpdateStyle();
@@ skipping 66 matching lines @@
   if (!chromeos::NetworkHandler::IsInitialized())
     return NULL;
   if (status == LoginStatus::NOT_LOGGED_IN)
     return NULL;
   if (!tray::VpnDefaultView::ShouldShow())
     return NULL;
 
   const bool is_in_secondary_login_screen =
       WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen();
 
-  default_ = new tray::VpnDefaultView(
-      this, status != LoginStatus::LOCKED && !is_in_secondary_login_screen);
+  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);
   if (!chromeos::NetworkHandler::IsInitialized())
     return NULL;
 
   WmShell::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_DETAILED_VPN_VIEW);
@@ skipping 18 matching lines @@
 void TrayVPN::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {}
 
 void TrayVPN::NetworkStateChanged() {
   if (default_)
     default_->Update();
   if (detailed_)
     detailed_->Update();
 }
 
 }  // namespace ash