| Index: chrome/browser/sync/engine/sync_scheduler.h
|
| diff --git a/chrome/browser/sync/engine/sync_scheduler.h b/chrome/browser/sync/engine/sync_scheduler.h
|
| index 4b1593be05f5f6af351b21309beee0ca7fe89a35..bf60d675f2db132cb75233cf320c71ceb8b8651f 100644
|
| --- a/chrome/browser/sync/engine/sync_scheduler.h
|
| +++ b/chrome/browser/sync/engine/sync_scheduler.h
|
| @@ -37,8 +37,7 @@ namespace browser_sync {
|
|
|
| struct ServerConnectionEvent;
|
|
|
| -class SyncScheduler : public sessions::SyncSession::Delegate,
|
| - public ServerConnectionEventListener {
|
| +class SyncScheduler : public sessions::SyncSession::Delegate {
|
| public:
|
| enum Mode {
|
| // In this mode, the thread only performs configuration tasks. This is
|
| @@ -123,10 +122,19 @@ class SyncScheduler : public sessions::SyncSession::Delegate,
|
| virtual void OnSyncProtocolError(
|
| const sessions::SyncSessionSnapshot& snapshot) OVERRIDE;
|
|
|
| - // ServerConnectionEventListener implementation.
|
| - // TODO(tim): schedule a nudge when valid connection detected? in 1 minute?
|
| - virtual void OnServerConnectionEvent(
|
| - const ServerConnectionEvent& event) OVERRIDE;
|
| + // Forces the scheduler to make another attempt to contact the server.
|
| + //
|
| + // Does not override THROTTLED state. Should be called when some client-side
|
| + // event, such as an IP address change or the receipt of new auth credentials,
|
| + // imporoves our odds of successfully contacting the server.
|
| + //
|
| + // WARNING: This function will also lead to retries in the case where our
|
| + // connection to the server was perfectly fine. If used improperly, this
|
| + // function coudl DoS the server.
|
| + //
|
| + // WARNING: This function is synchronous. Do not call it unless you are
|
| + // prepared to wait the duration of a sync cycle.
|
| + void TryToConnect();
|
|
|
| private:
|
| enum JobProcessDecision {
|
| @@ -340,9 +348,6 @@ class SyncScheduler : public sessions::SyncSession::Delegate,
|
| SyncerStep* start,
|
| SyncerStep* end);
|
|
|
| - // Initializes the hookup between the ServerConnectionManager and us.
|
| - void WatchConnectionManager();
|
| -
|
| // Used to update |server_connection_ok_|, see below.
|
| void CheckServerConnectionManagerStatus(
|
| HttpResponse::ServerConnectionCode code);
|
|
|