Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(239)

Side by Side Diff: chrome/browser/sync/sync_ui_util.cc

Issue 8919021: [Sync] Rename ModelEnumSet to ModelTypeSet (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 595 matching lines...) Expand 10 before | Expand all | Expand 10 after
606 "Passphrase Required", 606 "Passphrase Required",
607 service->IsPassphraseRequired()); 607 service->IsPassphraseRequired());
608 sync_ui_util::AddBoolSyncDetail(details, 608 sync_ui_util::AddBoolSyncDetail(details,
609 "Cryptographer Ready", 609 "Cryptographer Ready",
610 full_status.cryptographer_ready); 610 full_status.cryptographer_ready);
611 sync_ui_util::AddBoolSyncDetail(details, 611 sync_ui_util::AddBoolSyncDetail(details,
612 "Cryptographer Has Pending Keys", 612 "Cryptographer Has Pending Keys",
613 full_status.crypto_has_pending_keys); 613 full_status.crypto_has_pending_keys);
614 sync_ui_util::AddStringSyncDetails(details, 614 sync_ui_util::AddStringSyncDetails(details,
615 "Encrypted Types", 615 "Encrypted Types",
616 syncable::ModelEnumSetToString(full_status.encrypted_types)); 616 syncable::ModelTypeSetToString(full_status.encrypted_types));
617 617
618 const browser_sync::sessions::SyncSessionSnapshot* snapshot = 618 const browser_sync::sessions::SyncSessionSnapshot* snapshot =
619 service->sync_initialized() ? 619 service->sync_initialized() ?
620 service->GetLastSessionSnapshot() : NULL; 620 service->GetLastSessionSnapshot() : NULL;
621 621
622 // |snapshot| could be NULL if sync is not yet initialized. 622 // |snapshot| could be NULL if sync is not yet initialized.
623 if (snapshot) { 623 if (snapshot) {
624 sync_ui_util::AddIntSyncDetail(details, "Download Count (This Session)", 624 sync_ui_util::AddIntSyncDetail(details, "Download Count (This Session)",
625 snapshot->syncer_status.num_updates_downloaded_total); 625 snapshot->syncer_status.num_updates_downloaded_total);
626 sync_ui_util::AddIntSyncDetail(details, "Commit Count (This Session)", 626 sync_ui_util::AddIntSyncDetail(details, "Commit Count (This Session)",
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
706 } 706 }
707 } else { 707 } else {
708 version_modifier = " " + version_modifier; 708 version_modifier = " " + version_modifier;
709 } 709 }
710 return chrome_version.Name() + " " + chrome_version.OSType() + " " + 710 return chrome_version.Name() + " " + chrome_version.OSType() + " " +
711 chrome_version.Version() + " (" + chrome_version.LastChange() + ")" + 711 chrome_version.Version() + " (" + chrome_version.LastChange() + ")" +
712 version_modifier; 712 version_modifier;
713 } 713 }
714 714
715 } // namespace sync_ui_util 715 } // namespace sync_ui_util
OLDNEW
« no previous file with comments | « chrome/browser/sync/sync_setup_wizard_unittest.cc ('k') | chrome/browser/sync/syncable/directory_change_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698