| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/sessions/sync_session.h" | 5 #include "chrome/browser/sync/sessions/sync_session.h" |
| 6 | 6 |
| 7 #include "chrome/browser/sync/engine/conflict_resolver.h" | 7 #include "chrome/browser/sync/engine/conflict_resolver.h" |
| 8 #include "chrome/browser/sync/engine/syncer_types.h" | 8 #include "chrome/browser/sync/engine/syncer_types.h" |
| 9 #include "chrome/browser/sync/engine/syncer_util.h" | 9 #include "chrome/browser/sync/engine/syncer_util.h" |
| 10 #include "chrome/browser/sync/syncable/directory_manager.h" | 10 #include "chrome/browser/sync/syncable/directory_manager.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 return false; | 43 return false; |
| 44 } | 44 } |
| 45 virtual void OnReceivedLongPollIntervalUpdate( | 45 virtual void OnReceivedLongPollIntervalUpdate( |
| 46 const base::TimeDelta& new_interval) { | 46 const base::TimeDelta& new_interval) { |
| 47 FailControllerInvocationIfDisabled("OnReceivedLongPollIntervalUpdate"); | 47 FailControllerInvocationIfDisabled("OnReceivedLongPollIntervalUpdate"); |
| 48 } | 48 } |
| 49 virtual void OnReceivedShortPollIntervalUpdate( | 49 virtual void OnReceivedShortPollIntervalUpdate( |
| 50 const base::TimeDelta& new_interval) { | 50 const base::TimeDelta& new_interval) { |
| 51 FailControllerInvocationIfDisabled("OnReceivedShortPollIntervalUpdate"); | 51 FailControllerInvocationIfDisabled("OnReceivedShortPollIntervalUpdate"); |
| 52 } | 52 } |
| 53 virtual void OnShouldStopSyncingPermanently() { |
| 54 FailControllerInvocationIfDisabled("OnShouldStopSyncingPermanently"); |
| 55 } |
| 53 | 56 |
| 54 // ModelSafeWorkerRegistrar implementation. | 57 // ModelSafeWorkerRegistrar implementation. |
| 55 virtual void GetWorkers(std::vector<ModelSafeWorker*>* out) {} | 58 virtual void GetWorkers(std::vector<ModelSafeWorker*>* out) {} |
| 56 virtual void GetModelSafeRoutingInfo(ModelSafeRoutingInfo* out) { | 59 virtual void GetModelSafeRoutingInfo(ModelSafeRoutingInfo* out) { |
| 57 (*out)[syncable::BOOKMARKS] = GROUP_UI; | 60 (*out)[syncable::BOOKMARKS] = GROUP_UI; |
| 58 (*out)[syncable::AUTOFILL] = GROUP_UI; | 61 (*out)[syncable::AUTOFILL] = GROUP_UI; |
| 59 } | 62 } |
| 60 | 63 |
| 61 StatusController* status() { return session_->status_controller(); } | 64 StatusController* status() { return session_->status_controller(); } |
| 62 protected: | 65 protected: |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 // Conflict resolution happens after get updates and commit, | 230 // Conflict resolution happens after get updates and commit, |
| 228 // so we need to loop back and get updates / commit again now | 231 // so we need to loop back and get updates / commit again now |
| 229 // that we have made forward progress. | 232 // that we have made forward progress. |
| 230 status()->update_conflicts_resolved(true); | 233 status()->update_conflicts_resolved(true); |
| 231 EXPECT_TRUE(session_->HasMoreToSync()); | 234 EXPECT_TRUE(session_->HasMoreToSync()); |
| 232 } | 235 } |
| 233 | 236 |
| 234 } // namespace | 237 } // namespace |
| 235 } // namespace sessions | 238 } // namespace sessions |
| 236 } // namespace browser_sync | 239 } // namespace browser_sync |
| OLD | NEW |