diff options
| author | pavely@chromium.org <pavely@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-05 04:14:53 +0000 |
|---|---|---|
| committer | pavely@chromium.org <pavely@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-05 04:14:53 +0000 |
| commit | 7e31df8fe2753863416731f29b37c01441afaee4 (patch) | |
| tree | 3035a33d0950793f47f3ef543edd0fb44fbb2249 /sync/engine/net/server_connection_manager.h | |
| parent | 8f7d908a8a0c0a91edc0dd3c93fa823a801f5439 (diff) | |
| download | chromium_src-7e31df8fe2753863416731f29b37c01441afaee4.zip chromium_src-7e31df8fe2753863416731f29b37c01441afaee4.tar.gz chromium_src-7e31df8fe2753863416731f29b37c01441afaee4.tar.bz2 | |
Remove connection_code_ from SyncSchedulerImpl.
Removed connection_code_ from SyncSchedulerImpl since it essentially
mirrors ServerConnectionManager::server_status_.
One behavior changed as result of this change: Previously if
SyncSchedulerImpl::OnConnectionStatusChange was called when
connection_code_ is CONNECTION_UNAVAILABLE it would reset
connection_code_ to SERVER_CONNECTION_OK and consecutive calls to
SyncSchedulerImpl::OnConnectionStatusChange would not post canary job
until current one is finished and updates server_status_. With this
change it is no longer true.
Also moved notification about auth error from
SyncManagerImpl::OnInvalidatorStateChange to common code path. It no
longer makes assumption about error code that connection manager is
going to set in OnInvalidationCredentialsRejected.
Also removed few references to get_time.
BUG=177535
Review URL: https://chromiumcodereview.appspot.com/12390070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186092 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/engine/net/server_connection_manager.h')
| -rw-r--r-- | sync/engine/net/server_connection_manager.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sync/engine/net/server_connection_manager.h b/sync/engine/net/server_connection_manager.h index 0603340..bbb830d 100644 --- a/sync/engine/net/server_connection_manager.h +++ b/sync/engine/net/server_connection_manager.h @@ -256,9 +256,8 @@ class SYNC_EXPORT_PRIVATE ServerConnectionManager { return proto_sync_path_; } - std::string get_time_path() const { - return get_time_path_; - } + // Updates server_status_ and notifies listeners if server_status_ changed + void SetServerStatus(HttpResponse::ServerConnectionCode server_status); // NOTE: Tests rely on this protected function being virtual. // @@ -296,7 +295,6 @@ class SYNC_EXPORT_PRIVATE ServerConnectionManager { // The paths we post to. std::string proto_sync_path_; - std::string get_time_path_; // The auth token to use in authenticated requests. std::string auth_token_; |