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

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

Issue 2699443004: Modify TrayItemMore to use enabled status (Closed)
Patch Set: Rebased 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/tray_network.cc ('k') | ash/common/system/ime/tray_ime_chromeos.cc » ('j') | 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 809308d619ffebd925a1becbcce375002d08daf8..cd51438970eaa738d267b0d983089cc91be9bafa 100644
--- a/ash/common/system/chromeos/network/tray_vpn.cc
+++ b/ash/common/system/chromeos/network/tray_vpn.cc
@@ -35,8 +35,7 @@ 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);
@@ -75,8 +74,9 @@ class VpnDefaultView : public TrayItemMore,
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
@@ -163,8 +163,9 @@ views::View* TrayVPN::CreateDefaultView(LoginStatus status) {
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_;
}
« no previous file with comments | « ash/common/system/chromeos/network/tray_network.cc ('k') | ash/common/system/ime/tray_ime_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698