Merge 88317 - Show progress bar as soon as update state changed to UPDATE_STATUS_UPDATE_AVAILABLE

chrome/browser/chromeos/login/update_view.cc

 // Copyright (c) 2011 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 "chrome/browser/chromeos/login/update_view.h"
 
 #include <string>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/helper.h"
@@ skipping 40 matching lines @@
 const SkColor kLabelColor = 0xFF000000;
 const SkColor kSkipLabelColor = 0xFFAA0000;
 const SkColor kManualRebootLabelColor = 0xFFAA0000;
 
 }  // namespace
 
 namespace chromeos {
 
 UpdateView::UpdateView(chromeos::ScreenObserver* observer)
     : installing_updates_label_(NULL),
+      preparing_updates_label_(NULL),
       reboot_label_(NULL),
       manual_reboot_label_(NULL),
       progress_bar_(NULL),
       show_curtain_(true),
       show_manual_reboot_label_(false),
+      show_preparing_updates_label_(false),
       observer_(observer) {
 }
 
 UpdateView::~UpdateView() {
 }
 
 void UpdateView::Init() {
   // Use rounded-rect background.
   views::Painter* painter = chromeos::CreateWizardPainter(
       &chromeos::BorderDefinition::kScreenBorder);
   set_background(views::Background::CreateBackgroundPainter(true, painter));
 
   InitLabel(&installing_updates_label_);
+  InitLabel(&preparing_updates_label_);
   InitLabel(&reboot_label_);
   InitLabel(&manual_reboot_label_);
+  preparing_updates_label_->SetVisible(false);
   manual_reboot_label_->SetVisible(false);
   manual_reboot_label_->SetColor(kManualRebootLabelColor);
 
   progress_bar_ = new views::ProgressBar();
   AddChildView(progress_bar_);
 
   // Curtain view.
   InitLabel(&checking_label_);
   throbber_ = CreateDefaultThrobber();
   AddChildView(throbber_);
@@ skipping 10 matching lines @@
 }
 
 void UpdateView::Reset() {
   progress_bar_->SetProgress(0);
 }
 
 void UpdateView::UpdateLocalizedStrings() {
   installing_updates_label_->SetText(UTF16ToWide(l10n_util::GetStringFUTF16(
       IDS_INSTALLING_UPDATE,
       l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME))));
+  preparing_updates_label_->SetText(
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_UPDATE_AVAILABLE)));
   reboot_label_->SetText(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_INSTALLING_UPDATE_DESC)));
   manual_reboot_label_->SetText(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_UPDATE_COMPLETED)));
   checking_label_->SetText(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_CHECKING_FOR_UPDATES)));
 }
 
 void UpdateView::AddProgress(int ticks) {
   progress_bar_->AddProgress(ticks);
 }
 
 void UpdateView::SetProgress(int progress) {
   progress_bar_->SetProgress(progress);
 }
 
 void UpdateView::ShowManualRebootInfo() {
   show_manual_reboot_label_ = true;
   UpdateVisibility();
 }
 
+void UpdateView::ShowPreparingUpdatesInfo(bool visible) {
+  show_preparing_updates_label_ = visible;
+  UpdateVisibility();
+}
+
 void UpdateView::ShowCurtain(bool show_curtain) {
   if (show_curtain_ != show_curtain) {
     show_curtain_ = show_curtain;
     UpdateVisibility();
   }
 }
 
 // Sets the bounds of the view, placing center of the view at the given
 // coordinates (|x| and |y|).
 static void setViewBounds(views::View* view, int x, int y) {
   int preferred_width = view->GetPreferredSize().width();
   int preferred_height = view->GetPreferredSize().height();
   view->SetBounds(
       x - preferred_width / 2,
       y - preferred_height / 2,
       preferred_width,
       preferred_height);
 }
 
 void UpdateView::Layout() {
   int max_width = width() - GetInsets().width() - 2 * kHorizontalSpacing;
   int right_margin = GetInsets().right() + kHorizontalSpacing;
   int max_height = height() - GetInsets().height();
   int vertical_center = GetInsets().top() + max_height / 2;
 
   installing_updates_label_->SizeToFit(max_width);
+  preparing_updates_label_->SizeToFit(max_width);
   reboot_label_->SizeToFit(max_width);
   manual_reboot_label_->SizeToFit(max_width);
 
   progress_bar_->SetBounds(right_margin,
                            vertical_center - kProgressBarHeight / 2,
                            max_width,
                            kProgressBarHeight);
 
   installing_updates_label_->SetX(right_margin);
   installing_updates_label_->SetY(
       progress_bar_->y() -
       kInstallingUpdatesLabelYBottomFromProgressBar -
       installing_updates_label_->height());
+  preparing_updates_label_->SetX(installing_updates_label_->x());
+  preparing_updates_label_->SetY(installing_updates_label_->y());
   reboot_label_->SetX(right_margin);
   reboot_label_->SetY(
       progress_bar_->y() +
       progress_bar_->height() +
       kRebootLabelYFromProgressBar);
   manual_reboot_label_->SetX(reboot_label_->x());
   manual_reboot_label_->SetY(reboot_label_->y());
   // Curtain layout is independed.
   int x_center = width() / 2;
   int throbber_width = throbber_->GetPreferredSize().width();
@@ skipping 21 matching lines @@
   (*label)->SetMultiLine(true);
 
   ResourceBundle& res_bundle = ResourceBundle::GetSharedInstance();
   gfx::Font label_font = res_bundle.GetFont(ResourceBundle::MediumFont);
   (*label)->SetFont(label_font);
 
   AddChildView(*label);
 }
 
 void UpdateView::UpdateVisibility() {
-  installing_updates_label_->SetVisible(
-      !show_curtain_&& !show_manual_reboot_label_);
+  installing_updates_label_->SetVisible(!show_curtain_ &&
+                                        !show_manual_reboot_label_ &&
+                                        !show_preparing_updates_label_);
+  preparing_updates_label_->SetVisible(!show_curtain_ &&
+                                       !show_manual_reboot_label_ &&
+                                       show_preparing_updates_label_);
   reboot_label_->SetVisible(!show_curtain_&& !show_manual_reboot_label_);
   manual_reboot_label_->SetVisible(!show_curtain_ && show_manual_reboot_label_);
   progress_bar_->SetVisible(!show_curtain_);
 
   checking_label_->SetVisible(show_curtain_);
   throbber_->SetVisible(show_curtain_);
   if (show_curtain_) {
     throbber_->Start();
   } else {
     throbber_->Stop();
   }
 }
 
 }  // namespace chromeos