| 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 594 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 605 sync_ui_util::AddStringSyncDetails(encryption, | 605 sync_ui_util::AddStringSyncDetails(encryption, |
| 606 "Encrypted Types", | 606 "Encrypted Types", |
| 607 syncer::ModelTypeSetToString(full_status.encrypted_types)); | 607 syncer::ModelTypeSetToString(full_status.encrypted_types)); |
| 608 | 608 |
| 609 | 609 |
| 610 ListValue* cycles = AddSyncDetailsSection( | 610 ListValue* cycles = AddSyncDetailsSection( |
| 611 details, "Status from Last Completed Session"); | 611 details, "Status from Last Completed Session"); |
| 612 sync_ui_util::AddStringSyncDetails( | 612 sync_ui_util::AddStringSyncDetails( |
| 613 cycles, "Sync Source", | 613 cycles, "Sync Source", |
| 614 syncer::GetUpdatesSourceString( | 614 syncer::GetUpdatesSourceString( |
| 615 snapshot.source().updates_source)); | 615 snapshot.source().updates_source)); |
| 616 sync_ui_util::AddStringSyncDetails( |
| 617 cycles, "Get Encryption Key Result", |
| 618 GetSyncerErrorString( |
| 619 snapshot.model_neutral_state().last_get_key_result)); |
| 616 sync_ui_util::AddStringSyncDetails( | 620 sync_ui_util::AddStringSyncDetails( |
| 617 cycles, "Download Step Result", | 621 cycles, "Download Step Result", |
| 618 GetSyncerErrorString( | 622 GetSyncerErrorString( |
| 619 snapshot.model_neutral_state().last_download_updates_result)); | 623 snapshot.model_neutral_state().last_download_updates_result)); |
| 620 sync_ui_util::AddStringSyncDetails( | 624 sync_ui_util::AddStringSyncDetails( |
| 621 cycles, "Commit Step Result", | 625 cycles, "Commit Step Result", |
| 622 GetSyncerErrorString(snapshot.model_neutral_state().commit_result)); | 626 GetSyncerErrorString(snapshot.model_neutral_state().commit_result)); |
| 623 | 627 |
| 624 // Strictly increasing counters. | 628 // Strictly increasing counters. |
| 625 ListValue* counters = AddSyncDetailsSection(details, "Running Totals"); | 629 ListValue* counters = AddSyncDetailsSection(details, "Running Totals"); |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 775 } | 779 } |
| 776 } else { | 780 } else { |
| 777 version_modifier = " " + version_modifier; | 781 version_modifier = " " + version_modifier; |
| 778 } | 782 } |
| 779 return chrome_version.Name() + " " + chrome_version.OSType() + " " + | 783 return chrome_version.Name() + " " + chrome_version.OSType() + " " + |
| 780 chrome_version.Version() + " (" + chrome_version.LastChange() + ")" + | 784 chrome_version.Version() + " (" + chrome_version.LastChange() + ")" + |
| 781 version_modifier; | 785 version_modifier; |
| 782 } | 786 } |
| 783 | 787 |
| 784 } // namespace sync_ui_util | 788 } // namespace sync_ui_util |
| OLD | NEW |