From bd48735a97d0863c5ac560c76887ca48a4fe13b6 Mon Sep 17 00:00:00 2001 From: "paul@chromium.org" Date: Thu, 13 Aug 2009 18:19:00 +0000 Subject: Clear an error message from the throbber space. When an update fails, we display an error string and allow the user to try again by manually pressing the update button. When the user does that, we should clear the error message so that the update throbber doesn't draw over the text, which looks ugly. BUG=19272 (http://crbug.com/19272) TEST=Difficult to repro: try to update chrome and fail, press the update button and notice that the error message disappears when the throbber is active. Review URL: http://codereview.chromium.org/165462 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23329 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/cocoa/about_window_controller.mm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/chrome/browser/cocoa/about_window_controller.mm b/chrome/browser/cocoa/about_window_controller.mm index c145a14..d9ea076 100644 --- a/chrome/browser/cocoa/about_window_controller.mm +++ b/chrome/browser/cocoa/about_window_controller.mm @@ -107,9 +107,11 @@ NSString* const kUserClosedAboutNotification = // Don't let someone click "Update Now" twice! [updateNowButton_ setEnabled:NO]; [spinner_ startAnimation:self]; - if ([[self defaultKeystoneGlue] startUpdate:self]) + if ([[self defaultKeystoneGlue] startUpdate:self]) { + // Clear any previous error message from the throbber area. + [updateCompleted_ setStringValue:@""]; [spinner_ startAnimation:self]; - else { + } else { // TODO(jrg): localize. // IDS_UPGRADE_ERROR doesn't work here; we don't have an error number, and // "server not available" is too specific. -- cgit v1.1