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

Side by Side Diff: chrome/browser/sync/internal_api/sync_manager.cc

Issue 9348036: Trim code from sync's ServerConnectionManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Delete some more code Created 8 years, 10 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/internal_api/sync_manager.h" 5 #include "chrome/browser/sync/internal_api/sync_manager.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 virtual ModelTypeSet HandleTransactionEndingChangeEvent( 264 virtual ModelTypeSet HandleTransactionEndingChangeEvent(
265 const ImmutableWriteTransactionInfo& write_transaction_info, 265 const ImmutableWriteTransactionInfo& write_transaction_info,
266 syncable::BaseTransaction* trans) OVERRIDE; 266 syncable::BaseTransaction* trans) OVERRIDE;
267 virtual void HandleCalculateChangesChangeEventFromSyncApi( 267 virtual void HandleCalculateChangesChangeEventFromSyncApi(
268 const ImmutableWriteTransactionInfo& write_transaction_info, 268 const ImmutableWriteTransactionInfo& write_transaction_info,
269 syncable::BaseTransaction* trans) OVERRIDE; 269 syncable::BaseTransaction* trans) OVERRIDE;
270 virtual void HandleCalculateChangesChangeEventFromSyncer( 270 virtual void HandleCalculateChangesChangeEventFromSyncer(
271 const ImmutableWriteTransactionInfo& write_transaction_info, 271 const ImmutableWriteTransactionInfo& write_transaction_info,
272 syncable::BaseTransaction* trans) OVERRIDE; 272 syncable::BaseTransaction* trans) OVERRIDE;
273 273
274 // Listens for notifications from the ServerConnectionManager
275 void HandleServerConnectionEvent(const ServerConnectionEvent& event);
276
277 // Open the directory named with username_for_share 274 // Open the directory named with username_for_share
278 bool OpenDirectory(); 275 bool OpenDirectory();
279 276
280 // Cryptographer::Observer implementation. 277 // Cryptographer::Observer implementation.
281 virtual void OnEncryptedTypesChanged( 278 virtual void OnEncryptedTypesChanged(
282 syncable::ModelTypeSet encrypted_types, 279 syncable::ModelTypeSet encrypted_types,
283 bool encrypt_everything) OVERRIDE; 280 bool encrypt_everything) OVERRIDE;
284 281
285 // SyncNotifierObserver implementation. 282 // SyncNotifierObserver implementation.
286 virtual void OnNotificationStateChange( 283 virtual void OnNotificationStateChange(
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
670 667
671 SyncManager::ChangeObserver::~ChangeObserver() {} 668 SyncManager::ChangeObserver::~ChangeObserver() {}
672 669
673 SyncManager::Observer::~Observer() {} 670 SyncManager::Observer::~Observer() {}
674 671
675 SyncManager::SyncManager(const std::string& name) 672 SyncManager::SyncManager(const std::string& name)
676 : data_(new SyncInternal(name)) {} 673 : data_(new SyncInternal(name)) {}
677 674
678 SyncManager::Status::Status() 675 SyncManager::Status::Status()
679 : summary(INVALID), 676 : summary(INVALID),
680 authenticated(false),
681 server_up(false),
682 server_reachable(false),
683 notifications_enabled(false), 677 notifications_enabled(false),
684 notifications_received(0), 678 notifications_received(0),
685 unsynced_count(0), 679 unsynced_count(0),
686 conflicting_count(0), 680 conflicting_count(0),
687 committed_count(0), 681 committed_count(0),
688 syncing(false), 682 syncing(false),
689 initial_sync_ended(false), 683 initial_sync_ended(false),
690 updates_available(0), 684 updates_available(0),
691 updates_received(0), 685 updates_received(0),
692 tombstone_updates_received(0), 686 tombstone_updates_received(0),
(...skipping 1021 matching lines...) Expand 10 before | Expand all | Expand 10 after
1714 1708
1715 void SyncManager::SyncInternal::OnIPAddressChangedImpl() { 1709 void SyncManager::SyncInternal::OnIPAddressChangedImpl() {
1716 DCHECK(thread_checker_.CalledOnValidThread()); 1710 DCHECK(thread_checker_.CalledOnValidThread());
1717 if (scheduler()) 1711 if (scheduler())
1718 scheduler()->OnConnectionStatusChange(); 1712 scheduler()->OnConnectionStatusChange();
1719 } 1713 }
1720 1714
1721 void SyncManager::SyncInternal::OnServerConnectionEvent( 1715 void SyncManager::SyncInternal::OnServerConnectionEvent(
1722 const ServerConnectionEvent& event) { 1716 const ServerConnectionEvent& event) {
1723 DCHECK(thread_checker_.CalledOnValidThread()); 1717 DCHECK(thread_checker_.CalledOnValidThread());
1724 allstatus_.HandleServerConnectionEvent(event);
1725 if (event.connection_code == 1718 if (event.connection_code ==
1726 browser_sync::HttpResponse::SERVER_CONNECTION_OK) { 1719 browser_sync::HttpResponse::SERVER_CONNECTION_OK) {
1727 FOR_EACH_OBSERVER(SyncManager::Observer, observers_, 1720 FOR_EACH_OBSERVER(SyncManager::Observer, observers_,
1728 OnAuthError(AuthError::None())); 1721 OnAuthError(AuthError::None()));
1729 } 1722 }
1730 1723
1731 if (event.connection_code == browser_sync::HttpResponse::SYNC_AUTH_ERROR) { 1724 if (event.connection_code == browser_sync::HttpResponse::SYNC_AUTH_ERROR) {
1732 observing_ip_address_changes_ = false; 1725 observing_ip_address_changes_ = false;
1733 FOR_EACH_OBSERVER(SyncManager::Observer, observers_, 1726 FOR_EACH_OBSERVER(SyncManager::Observer, observers_,
1734 OnAuthError(AuthError(AuthError::INVALID_GAIA_CREDENTIALS))); 1727 OnAuthError(AuthError(AuthError::INVALID_GAIA_CREDENTIALS)));
(...skipping 758 matching lines...) Expand 10 before | Expand all | Expand 10 after
2493 lookup->GetDownloadProgress(i.Get(), &marker); 2486 lookup->GetDownloadProgress(i.Get(), &marker);
2494 2487
2495 if (marker.token().empty()) 2488 if (marker.token().empty())
2496 result.Put(i.Get()); 2489 result.Put(i.Get());
2497 2490
2498 } 2491 }
2499 return result; 2492 return result;
2500 } 2493 }
2501 2494
2502 } // namespace sync_api 2495 } // namespace sync_api
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698