| 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 649 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 660 sync_ui_util::AddIntSyncDetail( | 660 sync_ui_util::AddIntSyncDetail( |
| 661 counters, "Conflict Resolved: Client Wins", | 661 counters, "Conflict Resolved: Client Wins", |
| 662 full_status.num_local_overwrites_total); | 662 full_status.num_local_overwrites_total); |
| 663 sync_ui_util::AddIntSyncDetail( | 663 sync_ui_util::AddIntSyncDetail( |
| 664 counters, "Conflict Resolved: Server Wins", | 664 counters, "Conflict Resolved: Server Wins", |
| 665 full_status.num_server_overwrites_total); | 665 full_status.num_server_overwrites_total); |
| 666 | 666 |
| 667 // This is counted when we prepare the commit message. | 667 // This is counted when we prepare the commit message. |
| 668 ListValue* transient_cycle = AddSyncDetailsSection( | 668 ListValue* transient_cycle = AddSyncDetailsSection( |
| 669 details, "Transient Counters (this cycle)"); | 669 details, "Transient Counters (this cycle)"); |
| 670 sync_ui_util::AddIntSyncDetail(transient_cycle, | |
| 671 "Unsynced Count (before commit)", | |
| 672 full_status.unsynced_count); | |
| 673 | 670 |
| 674 // These are counted during the ApplyUpdates step. | 671 // These are counted during the ApplyUpdates step. |
| 675 sync_ui_util::AddIntSyncDetail( | 672 sync_ui_util::AddIntSyncDetail( |
| 676 transient_cycle, "Encryption Conflicts", | 673 transient_cycle, "Encryption Conflicts", |
| 677 full_status.encryption_conflicts); | 674 full_status.encryption_conflicts); |
| 678 sync_ui_util::AddIntSyncDetail( | 675 sync_ui_util::AddIntSyncDetail( |
| 679 transient_cycle, "Hierarchy Conflicts", | 676 transient_cycle, "Hierarchy Conflicts", |
| 680 full_status.hierarchy_conflicts); | 677 full_status.hierarchy_conflicts); |
| 681 sync_ui_util::AddIntSyncDetail( | 678 sync_ui_util::AddIntSyncDetail( |
| 682 transient_cycle, "Simple Conflicts", | 679 transient_cycle, "Simple Conflicts", |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 787 } | 784 } |
| 788 } else { | 785 } else { |
| 789 version_modifier = " " + version_modifier; | 786 version_modifier = " " + version_modifier; |
| 790 } | 787 } |
| 791 return chrome_version.Name() + " " + chrome_version.OSType() + " " + | 788 return chrome_version.Name() + " " + chrome_version.OSType() + " " + |
| 792 chrome_version.Version() + " (" + chrome_version.LastChange() + ")" + | 789 chrome_version.Version() + " (" + chrome_version.LastChange() + ")" + |
| 793 version_modifier; | 790 version_modifier; |
| 794 } | 791 } |
| 795 | 792 |
| 796 } // namespace sync_ui_util | 793 } // namespace sync_ui_util |
| OLD | NEW |