chromeos: Improve brightness and volume animations.

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 <algorithm>
 #include <string>
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "views/border.h"
 #include "views/controls/label.h"
 #include "views/controls/progress_bar.h"
 #include "views/controls/throbber.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/widget.h"
 
+using std::max;
 using views::Background;
 using views::Label;
 using views::View;
 using views::Widget;
 
 namespace {
 
 // TODO(nkostylev): Switch to GridLayout.
 
 // Y offset for the 'installing updates' label.
@@ skipping 46 matching lines @@
   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_);
+  progress_bar_->SetDisplayRange(0.0, 100.0);
 
   // Curtain view.
   InitLabel(&checking_label_);
   throbber_ = CreateDefaultThrobber();
   AddChildView(throbber_);
 
 #if !defined(OFFICIAL_BUILD)
   InitLabel(&escape_to_skip_label_);
   escape_to_skip_label_->SetColor(kSkipLabelColor);
   escape_to_skip_label_->SetText(
       L"Press ESCAPE to skip (Non-official builds only)");
 #endif
 
   UpdateLocalizedStrings();
   UpdateVisibility();
 }
 
 void UpdateView::Reset() {
-  progress_bar_->SetProgress(0);
+  progress_bar_->SetValue(0.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);
+  progress_bar_->SetValue(
+      max(progress_bar_->current_value() + ticks, 100.0));
 }
 
 void UpdateView::SetProgress(int progress) {
-  progress_bar_->SetProgress(progress);
+  progress_bar_->SetValue(progress);
 }
 
 void UpdateView::ShowManualRebootInfo() {
   show_manual_reboot_label_ = true;
   UpdateVisibility();
 }
 
 void UpdateView::ShowPreparingUpdatesInfo(bool visible) {
   show_preparing_updates_label_ = visible;
   UpdateVisibility();
@@ skipping 113 matching lines @@
   } else {
     NOTREACHED();
   }
   const std::string text =
       label_spoken ? WideToUTF8(label_spoken->GetText()) : std::string();
   WizardAccessibilityHelper::GetInstance()->MaybeSpeak(text.c_str(), false,
                                                        true);
 }
 
 }  // namespace chromeos