[Merge to M60] 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/session/session_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_controller.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_popup_item_style.h"
 #include "ash/system/tray/tray_popup_utils.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 55 matching lines @@
     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 (!Shell::Get()->session_controller()->ShouldEnableSettings()) {
+        // Disables the view if settings page is not enabled.
+        tri_view->SetEnabled(false);
+        update_label_->SetEnabled(false);
+      }
     } 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 65 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