| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/sync/sync_ui_util.h" | 5 #include "chrome/browser/sync/sync_ui_util.h" |
| 6 | 6 |
| 7 #include "base/i18n/number_formatting.h" | 7 #include "base/i18n/number_formatting.h" |
| 8 #include "base/i18n/time_formatting.h" | 8 #include "base/i18n/time_formatting.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 597 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 608 syncable::ModelTypeSetToString(full_status.encrypted_types)); | 608 syncable::ModelTypeSetToString(full_status.encrypted_types)); |
| 609 | 609 |
| 610 | 610 |
| 611 ListValue* cycles = AddSyncDetailsSection( | 611 ListValue* cycles = AddSyncDetailsSection( |
| 612 details, "Status from Last Completed Session"); | 612 details, "Status from Last Completed Session"); |
| 613 sync_ui_util::AddStringSyncDetails( | 613 sync_ui_util::AddStringSyncDetails( |
| 614 cycles, "Sync Source", | 614 cycles, "Sync Source", |
| 615 browser_sync::GetUpdatesSourceString( | 615 browser_sync::GetUpdatesSourceString( |
| 616 snapshot.source().updates_source)); | 616 snapshot.source().updates_source)); |
| 617 sync_ui_util::AddStringSyncDetails( | 617 sync_ui_util::AddStringSyncDetails( |
| 618 cycles, "Download Updates", | 618 cycles, "Download Step Result", |
| 619 GetSyncerErrorString(snapshot.errors().last_download_updates_result)); | 619 GetSyncerErrorString(snapshot.errors().last_download_updates_result)); |
| 620 sync_ui_util::AddStringSyncDetails( | 620 sync_ui_util::AddStringSyncDetails( |
| 621 cycles, "Post Commit", | 621 cycles, "Commit Step Result", |
| 622 GetSyncerErrorString(snapshot.errors().last_post_commit_result)); | 622 GetSyncerErrorString(snapshot.errors().commit_result)); |
| 623 sync_ui_util::AddStringSyncDetails( | |
| 624 cycles, "Process Commit Response", | |
| 625 GetSyncerErrorString( | |
| 626 snapshot.errors().last_process_commit_response_result)); | |
| 627 | 623 |
| 628 // Strictly increasing counters. | 624 // Strictly increasing counters. |
| 629 ListValue* counters = AddSyncDetailsSection(details, "Running Totals"); | 625 ListValue* counters = AddSyncDetailsSection(details, "Running Totals"); |
| 630 sync_ui_util::AddIntSyncDetail(counters, | 626 sync_ui_util::AddIntSyncDetail(counters, |
| 631 "Notifications Received", | 627 "Notifications Received", |
| 632 full_status.notifications_received); | 628 full_status.notifications_received); |
| 633 | 629 |
| 634 sync_ui_util::AddIntSyncDetail(counters, | 630 sync_ui_util::AddIntSyncDetail(counters, |
| 635 "Cycles Without Updates", | 631 "Cycles Without Updates", |
| 636 full_status.empty_get_updates); | 632 full_status.empty_get_updates); |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 791 } | 787 } |
| 792 } else { | 788 } else { |
| 793 version_modifier = " " + version_modifier; | 789 version_modifier = " " + version_modifier; |
| 794 } | 790 } |
| 795 return chrome_version.Name() + " " + chrome_version.OSType() + " " + | 791 return chrome_version.Name() + " " + chrome_version.OSType() + " " + |
| 796 chrome_version.Version() + " (" + chrome_version.LastChange() + ")" + | 792 chrome_version.Version() + " (" + chrome_version.LastChange() + ")" + |
| 797 version_modifier; | 793 version_modifier; |
| 798 } | 794 } |
| 799 | 795 |
| 800 } // namespace sync_ui_util | 796 } // namespace sync_ui_util |
| OLD | NEW |