diff options
author | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 02:39:43 +0000 |
---|---|---|
committer | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 02:39:43 +0000 |
commit | d550ce0e73f31f84efd7be83309e913a97ca60e5 (patch) | |
tree | 81b25fd9c4f5d49d8a44c7d40b7187fd70ed180f /chrome/browser/sync/profile_sync_service.h | |
parent | 6652074712f84591150721953f6ed8049145256e (diff) | |
download | chromium_src-d550ce0e73f31f84efd7be83309e913a97ca60e5.zip chromium_src-d550ce0e73f31f84efd7be83309e913a97ca60e5.tar.gz chromium_src-d550ce0e73f31f84efd7be83309e913a97ca60e5.tar.bz2 |
Change definition of about:sync summary
The old syner status definition has outlived its usefulness. After a
series of refactorings in the status summary reporting classes, it
provides practically no useful and non-redundant information.
The new syncer status is based on the information available to the
ProfileSyncService. It attempts to indicate what level of
initialization the sync service has reached, and therefore what sort of
service a user ought to expect from it.
This has a significant impact on some tests, which have come to rely on
the summary as a means of inspecting internal state. I consider this to
be a bad idea, since most of these tests should be testing behaviour,
not internal state. In an attempt to discourage tests from relying on
this summary in the future, the summary is now available only as an
std::string.
This change breaks the python functional sync tests. However, these
test were already broken prior to this change. Fixing and re-enabling
these tests is a job best left ot a future CL.
BUG=112229,98346
TEST=
Review URL: http://codereview.chromium.org/9724012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127886 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/profile_sync_service.h')
-rw-r--r-- | chrome/browser/sync/profile_sync_service.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h index 273d9c9..b4b0a51 100644 --- a/chrome/browser/sync/profile_sync_service.h +++ b/chrome/browser/sync/profile_sync_service.h @@ -259,7 +259,7 @@ class ProfileSyncService : public browser_sync::SyncFrontend, virtual void OnUserCancelledDialog(); // Get various information for displaying in the user interface. - browser_sync::SyncBackendHost::StatusSummary QuerySyncStatusSummary(); + std::string QuerySyncStatusSummary(); virtual browser_sync::SyncBackendHost::Status QueryDetailedSyncStatus(); virtual const GoogleServiceAuthError& GetAuthError() const; @@ -290,10 +290,6 @@ class ProfileSyncService : public browser_sync::SyncFrontend, virtual void ShowSyncSetup(const std::string& sub_page); void ShowSyncSetupWithWizard(SyncSetupWizard::State state); - // Pretty-printed strings for a given StatusSummary. - static std::string BuildSyncStatusSummaryText( - const browser_sync::SyncBackendHost::StatusSummary& summary); - // Returns true if the SyncBackendHost has told us it's ready to accept // changes. // [REMARK] - it is safe to call this function only from the ui thread. |