OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <stddef.h> | 7 #include <stddef.h> |
8 #include <map> | 8 #include <map> |
9 #include <ostream> | 9 #include <ostream> |
10 #include <set> | 10 #include <set> |
(...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
498 // An invariant has been violated. Transition to an error state where we try | 498 // An invariant has been violated. Transition to an error state where we try |
499 // to do as little work as possible, to avoid further corruption or crashes. | 499 // to do as little work as possible, to avoid further corruption or crashes. |
500 void ProfileSyncService::OnUnrecoverableError( | 500 void ProfileSyncService::OnUnrecoverableError( |
501 const tracked_objects::Location& from_here, | 501 const tracked_objects::Location& from_here, |
502 const std::string& message) { | 502 const std::string& message) { |
503 unrecoverable_error_detected_ = true; | 503 unrecoverable_error_detected_ = true; |
504 unrecoverable_error_message_ = message; | 504 unrecoverable_error_message_ = message; |
505 unrecoverable_error_location_.reset( | 505 unrecoverable_error_location_.reset( |
506 new tracked_objects::Location(from_here.function_name(), | 506 new tracked_objects::Location(from_here.function_name(), |
507 from_here.file_name(), | 507 from_here.file_name(), |
508 from_here.line_number())); | 508 from_here.line_number(), |
| 509 from_here.program_counter())); |
509 | 510 |
510 // Tell the wizard so it can inform the user only if it is already open. | 511 // Tell the wizard so it can inform the user only if it is already open. |
511 wizard_.Step(SyncSetupWizard::FATAL_ERROR); | 512 wizard_.Step(SyncSetupWizard::FATAL_ERROR); |
512 | 513 |
513 NotifyObservers(); | 514 NotifyObservers(); |
514 LOG(ERROR) << "Unrecoverable error detected -- ProfileSyncService unusable." | 515 LOG(ERROR) << "Unrecoverable error detected -- ProfileSyncService unusable." |
515 << message; | 516 << message; |
516 std::string location; | 517 std::string location; |
517 from_here.Write(true, true, &location); | 518 from_here.Write(true, true, &location); |
518 LOG(ERROR) << location; | 519 LOG(ERROR) << location; |
(...skipping 814 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1333 return false; | 1334 return false; |
1334 | 1335 |
1335 return data_type_manager_->state() == DataTypeManager::CONFIGURED; | 1336 return data_type_manager_->state() == DataTypeManager::CONFIGURED; |
1336 } | 1337 } |
1337 | 1338 |
1338 ProfileSyncService::EncryptedTypes::EncryptedTypes() { | 1339 ProfileSyncService::EncryptedTypes::EncryptedTypes() { |
1339 current.insert(syncable::PASSWORDS); | 1340 current.insert(syncable::PASSWORDS); |
1340 } | 1341 } |
1341 | 1342 |
1342 ProfileSyncService::EncryptedTypes::~EncryptedTypes() {} | 1343 ProfileSyncService::EncryptedTypes::~EncryptedTypes() {} |
OLD | NEW |