| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/profile_sync_service.h" | 5 #include "chrome/browser/sync/profile_sync_service.h" |
| 6 | 6 |
| 7 #include <cstddef> | 7 #include <cstddef> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 523 return; | 523 return; |
| 524 switch (data_type) { | 524 switch (data_type) { |
| 525 case syncable::SESSIONS: | 525 case syncable::SESSIONS: |
| 526 RegisterDataTypeController( | 526 RegisterDataTypeController( |
| 527 new browser_sync::SessionDataTypeController(factory_, | 527 new browser_sync::SessionDataTypeController(factory_, |
| 528 profile_, | 528 profile_, |
| 529 this)); | 529 this)); |
| 530 return; | 530 return; |
| 531 case syncable::TYPED_URLS: | 531 case syncable::TYPED_URLS: |
| 532 RegisterDataTypeController( | 532 RegisterDataTypeController( |
| 533 new browser_sync::TypedUrlDataTypeController(factory_, profile_)); | 533 new browser_sync::TypedUrlDataTypeController(factory_, |
| 534 profile_, |
| 535 this)); |
| 534 return; | 536 return; |
| 535 default: | 537 default: |
| 536 break; | 538 break; |
| 537 } | 539 } |
| 538 NOTREACHED(); | 540 NOTREACHED(); |
| 539 } | 541 } |
| 540 | 542 |
| 541 // An invariant has been violated. Transition to an error state where we try | 543 // An invariant has been violated. Transition to an error state where we try |
| 542 // to do as little work as possible, to avoid further corruption or crashes. | 544 // to do as little work as possible, to avoid further corruption or crashes. |
| 543 void ProfileSyncService::OnUnrecoverableError( | 545 void ProfileSyncService::OnUnrecoverableError( |
| (...skipping 1009 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1553 << "Unrecoverable error."; | 1555 << "Unrecoverable error."; |
| 1554 } else { | 1556 } else { |
| 1555 DVLOG(0) << "ConfigureDataTypeManager not invoked because backend is not " | 1557 DVLOG(0) << "ConfigureDataTypeManager not invoked because backend is not " |
| 1556 << "initialized"; | 1558 << "initialized"; |
| 1557 } | 1559 } |
| 1558 } | 1560 } |
| 1559 | 1561 |
| 1560 const FailedDatatypesHandler& ProfileSyncService::failed_datatypes_handler() { | 1562 const FailedDatatypesHandler& ProfileSyncService::failed_datatypes_handler() { |
| 1561 return failed_datatypes_handler_; | 1563 return failed_datatypes_handler_; |
| 1562 } | 1564 } |
| OLD | NEW |