diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-07 21:42:56 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-07 21:42:56 +0000 |
commit | 199c79368271c82d773b2e89dbf030037dcc5fec (patch) | |
tree | a0e8cf57737c8db7c588efd97451e7d2a863256a /chrome/browser/views/clear_server_data.cc | |
parent | ae97030793d282ecef7579c1726f8a36825a438f (diff) | |
download | chromium_src-199c79368271c82d773b2e89dbf030037dcc5fec.zip chromium_src-199c79368271c82d773b2e89dbf030037dcc5fec.tar.gz chromium_src-199c79368271c82d773b2e89dbf030037dcc5fec.tar.bz2 |
[Mac] UI for clearing sync data on the server.
xib change: Nest current checkboxes inside tab, add needed elements to other tab.
BUG=57876
TEST=as in bug 54349; functionality currently hidden behind flag
Review URL: http://codereview.chromium.org/3590020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61848 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/clear_server_data.cc')
-rw-r--r-- | chrome/browser/views/clear_server_data.cc | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/chrome/browser/views/clear_server_data.cc b/chrome/browser/views/clear_server_data.cc index dae4387..506083b 100644 --- a/chrome/browser/views/clear_server_data.cc +++ b/chrome/browser/views/clear_server_data.cc @@ -276,39 +276,39 @@ void ClearServerDataView::OnStateChanged() { void ClearServerDataView::UpdateControlEnabledState() { bool delete_in_progress = false; - // We only want to call Suceeded/FailedClearingServerData once, not every - // time the view is refreshed. As such, on success/failure we handle that - // state and immediately reset things back to CLEAR_NOT_STARTED. + // Succeeded/FailedClearingServerData should only be called once, not every + // time the view is refreshed. As such, on success/failure handle that state + // and immediately reset things back to CLEAR_NOT_STARTED. ProfileSyncService::ClearServerDataState clear_state = - profile_->GetProfileSyncService()->GetClearServerDataState(); + profile_->GetProfileSyncService()->GetClearServerDataState(); profile_->GetProfileSyncService()->ResetClearServerDataState(); switch (clear_state) { case ProfileSyncService::CLEAR_NOT_STARTED: - // We can get here when we first start and after a failed clear (which - // does not close the tab), do nothing. + // This can occur on a first start and after a failed clear (which does + // not close the tab). Do nothing. break; case ProfileSyncService::CLEAR_CLEARING: - // Clearing buttons on all tabs are disabled at this - // point, throbber is going - status_label_->SetText(l10n_util::GetString(IDS_CLEAR_DATA_SENDING)); - status_label_->SetVisible(true); - delete_in_progress = true; + // Clearing buttons on all tabs are disabled at this point, throbber is + // going. + status_label_->SetText(l10n_util::GetString(IDS_CLEAR_DATA_SENDING)); + status_label_->SetVisible(true); + delete_in_progress = true; break; case ProfileSyncService::CLEAR_FAILED: - // Show an error and reallow clearing - clear_data_parent_window_->FailedClearingServerData(); - status_label_->SetText(l10n_util::GetString(IDS_CLEAR_DATA_ERROR)); - status_label_->SetVisible(true); - delete_in_progress = false; + // Show an error and reallow clearing. + clear_data_parent_window_->FailedClearingServerData(); + status_label_->SetText(l10n_util::GetString(IDS_CLEAR_DATA_ERROR)); + status_label_->SetVisible(true); + delete_in_progress = false; break; case ProfileSyncService::CLEAR_SUCCEEDED: - // Close the dialog box, success! - status_label_->SetVisible(false); - delete_in_progress = false; - clear_data_parent_window_->SucceededClearingServerData(); + // Close the dialog box, success! + status_label_->SetVisible(false); + delete_in_progress = false; + clear_data_parent_window_->SucceededClearingServerData(); break; - } + } // allow_clear can be false when a local browsing data clear is happening // from the neighboring tab. delete_in_progress means that a clear is |