diff options
| author | avayvod@google.com <avayvod@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-15 12:39:13 +0000 |
|---|---|---|
| committer | avayvod@google.com <avayvod@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-15 12:39:13 +0000 |
| commit | 857e79dae449847fe9045034039e57b1433ddb38 (patch) | |
| tree | b6be69ac644126f33ab5f32933ef720929ff6409 /chrome/browser/chromeos | |
| parent | 6a6ce8b3a868dd1f94f8731ebd05abd39da46fec (diff) | |
| download | chromium_src-857e79dae449847fe9045034039e57b1433ddb38.zip chromium_src-857e79dae449847fe9045034039e57b1433ddb38.tar.gz chromium_src-857e79dae449847fe9045034039e57b1433ddb38.tar.bz2 | |
Switched progress bar to integral positions (from 0 to 100).
BUG=none
TEST=Launch with --login-manager --login-screen=update and verify that
progress bar shows increasing progress and login screen is shown at the
end.
Review URL: http://codereview.chromium.org/945003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41580 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
| -rw-r--r-- | chrome/browser/chromeos/login/update_view.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/login/update_view.cc b/chrome/browser/chromeos/login/update_view.cc index 8bb06d7..fc22728 100644 --- a/chrome/browser/chromeos/login/update_view.cc +++ b/chrome/browser/chromeos/login/update_view.cc @@ -36,7 +36,7 @@ const SkColor kLabelColor = 0xFF000000; // Timer constants. const int kProgressTimerInterval = 200; -const int kProgressIncrement = 0.09; +const int kProgressIncrement = 9; } // namespace namespace chromeos { @@ -64,6 +64,7 @@ void UpdateView::Init() { installing_updates_label_->SetFont(base_font); progress_bar_ = new views::ProgressBar(); + progress_bar_->SetProgress(0); UpdateLocalizedStrings(); AddChildView(installing_updates_label_); @@ -100,8 +101,8 @@ void UpdateView::Layout() { } void UpdateView::OnTimerElapsed() { - double progress = progress_bar_->GetProgress(); - if (progress == 1.) { + int progress = progress_bar_->GetProgress(); + if (progress >= 100) { timer_.Stop(); if (observer_) { observer_->OnExit(ScreenObserver::UPDATE_NOUPDATE); |