diff options
| author | denisromanov@chromium.org <denisromanov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-18 06:06:16 +0000 |
|---|---|---|
| committer | denisromanov@chromium.org <denisromanov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-18 06:06:16 +0000 |
| commit | 33854c6774a129bbad6f184c75bae6308d9e0086 (patch) | |
| tree | 78b6815884378f45dc7a4063240852637452eb67 /views | |
| parent | 53a7aac95f9967f8da120acee2d1e857cbe1d8e8 (diff) | |
| download | chromium_src-33854c6774a129bbad6f184c75bae6308d9e0086.zip chromium_src-33854c6774a129bbad6f184c75bae6308d9e0086.tar.gz chromium_src-33854c6774a129bbad6f184c75bae6308d9e0086.tar.bz2 | |
Added actual GoogleUpdate functionality to the OOBE update screen.
Added AddProgress method to the progress bar control.
BUG=35249
TEST=Run out/Debug/chrome --login-manager --login-screen=update. Update screen should remain visible for at least 3 seconds. As there is no network available in this mode yet, login wizard should return back to the network selection screen.
Review URL: http://codereview.chromium.org/1061004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/progress_bar.cc | 4 | ||||
| -rw-r--r-- | views/controls/progress_bar.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/views/controls/progress_bar.cc b/views/controls/progress_bar.cc index 40cc814..1b1af25 100644 --- a/views/controls/progress_bar.cc +++ b/views/controls/progress_bar.cc @@ -162,6 +162,10 @@ int ProgressBar::GetProgress() const { return progress_; } +void ProgressBar::AddProgress(int tick) { + SetProgress(progress_ + tick); +} + void ProgressBar::SetTooltipText(const std::wstring& tooltip_text) { tooltip_text_ = tooltip_text; } diff --git a/views/controls/progress_bar.h b/views/controls/progress_bar.h index 128941f..65d10d7 100644 --- a/views/controls/progress_bar.h +++ b/views/controls/progress_bar.h @@ -42,6 +42,8 @@ class ProgressBar : public View { // Set and get the progress bar progress in range [0, kMaxProgress]. virtual void SetProgress(int progress); virtual int GetProgress() const; + // Add progress to current. + virtual void AddProgress(int tick); // Sets the tooltip text. Default behavior for a progress bar is to show // no tooltip on mouse hover. Calling this lets you set a custom tooltip. |