Fix crash of update-over-cellular icon

ash/system/update/tray_update.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/system/update/tray_update.h"
 
 #include "ash/metrics/user_metrics_action.h"
 #include "ash/public/interfaces/update.mojom.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/shell.h"
@@ skipping 49 matching lines @@
 // static
 bool TrayUpdate::factory_reset_required_ = false;
 // static
 bool TrayUpdate::update_over_cellular_available_ = false;
 
 mojom::UpdateType TrayUpdate::update_type_ = mojom::UpdateType::SYSTEM;
 
 // The "restart to update" item in the system tray menu.
 class TrayUpdate::UpdateView : public ActionableView {
  public:
-  explicit UpdateView(TrayUpdate* owner)
+  explicit UpdateView(TrayUpdate* owner, LoginStatus status)

[xiyuan, 2017/06/05 16:12:52]

nit: "explicit" can be removed since this is no longer a single arg ctor.

[weidongg, 2017/06/05 16:56:52]

Removed the second parameter.

       : ActionableView(owner, TrayPopupInkDropStyle::FILL_BOUNDS),
         update_label_(nullptr) {
     SetLayoutManager(new views::FillLayout);
 
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
     TriView* tri_view = TrayPopupUtils::CreateDefaultRowView();
     AddChildView(tri_view);
     views::ImageView* image = TrayPopupUtils::CreateMainImageView();
     image->SetImage(gfx::CreateVectorIcon(
         kSystemMenuUpdateIcon,
         IconColorForUpdateSeverity(owner->severity_, true)));
     tri_view->AddView(TriView::Container::START, image);
 
     base::string16 label_text;
+    update_label_ = TrayPopupUtils::CreateDefaultLabel();
     if (owner->factory_reset_required_) {
       label_text = bundle.GetLocalizedString(
           IDS_ASH_STATUS_TRAY_RESTART_AND_POWERWASH_TO_UPDATE);
     } else if (owner->update_type_ == mojom::UpdateType::FLASH) {
       label_text = bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_UPDATE_FLASH);
     } else if (!owner->update_required_ &&
                owner->update_over_cellular_available_) {
       label_text = bundle.GetLocalizedString(
           IDS_ASH_STATUS_TRAY_UPDATE_OVER_CELLULAR_AVAILABLE);
+      if (status == LoginStatus::LOCKED ||
+          status == LoginStatus::NOT_LOGGED_IN) {

[xiyuan, 2017/06/05 16:12:52]

Should we call SessionController::ShouldEnableSettings to be consistent with the
settings button?

[weidongg, 2017/06/05 16:56:52]

Aha, yes, good to know this api. Thanks.

+        // Disables the view as clicking it opens settings page which is not
+        // available in locked and login screen.
+        tri_view->SetEnabled(false);
+        update_label_->SetEnabled(false);

[xiyuan, 2017/06/05 16:12:52]

Does this only apply to cellular update available state? Should we apply it for
all update cases?

[weidongg, 2017/06/05 16:56:52]

The action of clicking in other update cases is rebooting, so I think we  only
need to disable cellular update case.

+      }
     } else {
       label_text = bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_UPDATE);
     }
 
     SetAccessibleName(label_text);
-    update_label_ = TrayPopupUtils::CreateDefaultLabel();
     update_label_->SetText(label_text);
 
     TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::DEFAULT_VIEW_LABEL);
     style.SetupLabel(update_label_);
     tri_view->AddView(TriView::Container::CENTER, update_label_);
 
     SetInkDropMode(InkDropHostView::InkDropMode::ON);
   }
 
   ~UpdateView() override {}
@@ skipping 26 matching lines @@
 TrayUpdate::~TrayUpdate() {}
 
 bool TrayUpdate::GetInitialVisibility() {
   // If chrome tells ash there is an update available before this item's system
   // tray is constructed then show the icon.
   return update_required_ || update_over_cellular_available_;
 }
 
 views::View* TrayUpdate::CreateDefaultView(LoginStatus status) {
   if (update_required_ || update_over_cellular_available_) {
-    update_view_ = new UpdateView(this);
+    update_view_ = new UpdateView(this, status);
     return update_view_;
   }
   return nullptr;
 }
 
 void TrayUpdate::DestroyDefaultView() {
   update_view_ = nullptr;
 }
 
 void TrayUpdate::ShowUpdateIcon(mojom::UpdateSeverity severity,
@@ skipping 18 matching lines @@
   update_over_cellular_available_ = true;
 
   // TODO(weidongg/691108): adjust severity according the amount of time passing
   // after update is available over cellular connection.
   // Use low severity for update available over cellular connection.
   SetIconColor(IconColorForUpdateSeverity(mojom::UpdateSeverity::LOW, false));
   tray_view()->SetVisible(true);
 }
 
 }  // namespace ash