| Index: ash/common/system/chromeos/network/tray_network.cc
|
| diff --git a/ash/common/system/chromeos/network/tray_network.cc b/ash/common/system/chromeos/network/tray_network.cc
|
| index 44c38399c1ca88e251aad7cacd580603ee855172..14de552f6e36a09e99a815328030f63ecd223472 100644
|
| --- a/ash/common/system/chromeos/network/tray_network.cc
|
| +++ b/ash/common/system/chromeos/network/tray_network.cc
|
| @@ -129,8 +129,8 @@ class NetworkTrayView : public TrayItemView,
|
| class NetworkDefaultView : public TrayItemMore,
|
| public network_icon::AnimationObserver {
|
| public:
|
| - NetworkDefaultView(TrayNetwork* network_tray, bool show_more)
|
| - : TrayItemMore(network_tray, show_more) {
|
| + explicit NetworkDefaultView(TrayNetwork* network_tray)
|
| + : TrayItemMore(network_tray) {
|
| Update();
|
| }
|
|
|
| @@ -161,8 +161,9 @@ class NetworkDefaultView : 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(GetConnectedNetwork() != nullptr
|
| ? TrayPopupItemStyle::ColorStyle::ACTIVE
|
| : TrayPopupItemStyle::ColorStyle::INACTIVE);
|
| @@ -268,7 +269,8 @@ views::View* TrayNetwork::CreateDefaultView(LoginStatus status) {
|
| if (!chromeos::NetworkHandler::IsInitialized())
|
| return NULL;
|
| CHECK(tray_ != NULL);
|
| - default_ = new tray::NetworkDefaultView(this, status != LoginStatus::LOCKED);
|
| + default_ = new tray::NetworkDefaultView(this);
|
| + default_->SetEnabled(status != LoginStatus::LOCKED);
|
| return default_;
|
| }
|
|
|
|
|