diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-15 21:46:09 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-15 21:46:09 +0000 |
| commit | 0a143c48088aba7c1e6945b8593c9ee25eb6e6cb (patch) | |
| tree | 6f70be4a4a3e16f23df3cc71caa514f08e296884 | |
| parent | 3cfbc03f585ad5b933fd88517c44413c6306f7cd (diff) | |
| download | chromium_src-0a143c48088aba7c1e6945b8593c9ee25eb6e6cb.zip chromium_src-0a143c48088aba7c1e6945b8593c9ee25eb6e6cb.tar.gz chromium_src-0a143c48088aba7c1e6945b8593c9ee25eb6e6cb.tar.bz2 | |
Merge 270560 "sync: always StopModels in DTC if aborting load."
> sync: always StopModels in DTC if aborting load.
> BUG=352324
>
> Review URL: https://codereview.chromium.org/281173002
TBR=tim@chromium.org
Review URL: https://codereview.chromium.org/286163003
git-svn-id: svn://svn.chromium.org/chrome/branches/1916/src@270823 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/sync/glue/ui_data_type_controller.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/sync/glue/ui_data_type_controller.cc b/chrome/browser/sync/glue/ui_data_type_controller.cc index 884c73b..8101c4b 100644 --- a/chrome/browser/sync/glue/ui_data_type_controller.cc +++ b/chrome/browser/sync/glue/ui_data_type_controller.cc @@ -225,6 +225,9 @@ void UIDataTypeController::AbortModelLoad() { syncer::SyncError::DATATYPE_ERROR, "Aborted", type())); + // We don't want to continue loading models (e.g OnModelLoaded should never be + // called after we've decided to abort). + StopModels(); } void UIDataTypeController::StartDone( |