Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(33)

Side by Side Diff: chrome/browser/sync/profile_sync_service.cc

Issue 10559050: sync: rename OnDisableDatatype to DisableBrokenDatatype. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 613 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 LOG(ERROR) 624 LOG(ERROR)
625 << "Unrecoverable error detected at " << location 625 << "Unrecoverable error detected at " << location
626 << " -- ProfileSyncService unusable: " << message; 626 << " -- ProfileSyncService unusable: " << message;
627 627
628 // Shut all data types down. 628 // Shut all data types down.
629 MessageLoop::current()->PostTask(FROM_HERE, 629 MessageLoop::current()->PostTask(FROM_HERE,
630 base::Bind(&ProfileSyncService::ShutdownImpl, weak_factory_.GetWeakPtr(), 630 base::Bind(&ProfileSyncService::ShutdownImpl, weak_factory_.GetWeakPtr(),
631 delete_sync_database)); 631 delete_sync_database));
632 } 632 }
633 633
634 void ProfileSyncService::OnDisableDatatype( 634 void ProfileSyncService::DisableBrokenDatatype(
635 syncable::ModelType type, 635 syncable::ModelType type,
636 const tracked_objects::Location& from_here, 636 const tracked_objects::Location& from_here,
637 std::string message) { 637 std::string message) {
638 // First deactivate the type so that no further server changes are 638 // First deactivate the type so that no further server changes are
639 // passed onto the change processor. 639 // passed onto the change processor.
640 DeactivateDataType(type); 640 DeactivateDataType(type);
641 641
642 SyncError error(from_here, message, type); 642 SyncError error(from_here, message, type);
643 643
644 std::list<SyncError> errors; 644 std::list<SyncError> errors;
(...skipping 1057 matching lines...) Expand 10 before | Expand all | Expand 10 after
1702 // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefine d-behaviour-after-directly-calling-the-destru. 1702 // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefine d-behaviour-after-directly-calling-the-destru.
1703 ProfileSyncService* old_this = this; 1703 ProfileSyncService* old_this = this;
1704 this->~ProfileSyncService(); 1704 this->~ProfileSyncService();
1705 new(old_this) ProfileSyncService( 1705 new(old_this) ProfileSyncService(
1706 new ProfileSyncComponentsFactoryImpl(profile, 1706 new ProfileSyncComponentsFactoryImpl(profile,
1707 CommandLine::ForCurrentProcess()), 1707 CommandLine::ForCurrentProcess()),
1708 profile, 1708 profile,
1709 signin, 1709 signin,
1710 behavior); 1710 behavior);
1711 } 1711 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_service.h ('k') | chrome/browser/sync/profile_sync_service_mock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698