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

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: Rebase after Fred's patch Created 8 years, 9 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 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 virtual ModelTypeSet HandleTransactionEndingChangeEvent( 268 virtual ModelTypeSet HandleTransactionEndingChangeEvent(
269 const ImmutableWriteTransactionInfo& write_transaction_info, 269 const ImmutableWriteTransactionInfo& write_transaction_info,
270 syncable::BaseTransaction* trans) OVERRIDE; 270 syncable::BaseTransaction* trans) OVERRIDE;
271 virtual void HandleCalculateChangesChangeEventFromSyncApi( 271 virtual void HandleCalculateChangesChangeEventFromSyncApi(
272 const ImmutableWriteTransactionInfo& write_transaction_info, 272 const ImmutableWriteTransactionInfo& write_transaction_info,
273 syncable::BaseTransaction* trans) OVERRIDE; 273 syncable::BaseTransaction* trans) OVERRIDE;
274 virtual void HandleCalculateChangesChangeEventFromSyncer( 274 virtual void HandleCalculateChangesChangeEventFromSyncer(
275 const ImmutableWriteTransactionInfo& write_transaction_info, 275 const ImmutableWriteTransactionInfo& write_transaction_info,
276 syncable::BaseTransaction* trans) OVERRIDE; 276 syncable::BaseTransaction* trans) OVERRIDE;
277 277
278 // Listens for notifications from the ServerConnectionManager
279 void HandleServerConnectionEvent(const ServerConnectionEvent& event);
280
281 // Open the directory named with username_for_share 278 // Open the directory named with username_for_share
282 bool OpenDirectory(); 279 bool OpenDirectory();
283 280
284 // Cryptographer::Observer implementation. 281 // Cryptographer::Observer implementation.
285 virtual void OnEncryptedTypesChanged( 282 virtual void OnEncryptedTypesChanged(
286 syncable::ModelTypeSet encrypted_types, 283 syncable::ModelTypeSet encrypted_types,
287 bool encrypt_everything) OVERRIDE; 284 bool encrypt_everything) OVERRIDE;
288 285
289 // SyncNotifierObserver implementation. 286 // SyncNotifierObserver implementation.
290 virtual void OnNotificationStateChange( 287 virtual void OnNotificationStateChange(
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 681
685 SyncManager::ChangeObserver::~ChangeObserver() {} 682 SyncManager::ChangeObserver::~ChangeObserver() {}
686 683
687 SyncManager::Observer::~Observer() {} 684 SyncManager::Observer::~Observer() {}
688 685
689 SyncManager::SyncManager(const std::string& name) 686 SyncManager::SyncManager(const std::string& name)
690 : data_(new SyncInternal(name)) {} 687 : data_(new SyncInternal(name)) {}
691 688
692 SyncManager::Status::Status() 689 SyncManager::Status::Status()
693 : summary(INVALID), 690 : summary(INVALID),
694 authenticated(false),
695 server_up(false),
696 server_reachable(false),
697 notifications_enabled(false), 691 notifications_enabled(false),
698 notifications_received(0), 692 notifications_received(0),
699 unsynced_count(0), 693 unsynced_count(0),
700 encryption_conflicts(0), 694 encryption_conflicts(0),
701 hierarchy_conflicts(0), 695 hierarchy_conflicts(0),
702 simple_conflicts(0), 696 simple_conflicts(0),
703 server_conflicts(0), 697 server_conflicts(0),
704 committed_count(0), 698 committed_count(0),
705 syncing(false), 699 syncing(false),
706 initial_sync_ended(false), 700 initial_sync_ended(false),
(...skipping 1019 matching lines...) Expand 10 before | Expand all | Expand 10 after
1726 1720
1727 void SyncManager::SyncInternal::OnIPAddressChangedImpl() { 1721 void SyncManager::SyncInternal::OnIPAddressChangedImpl() {
1728 DCHECK(thread_checker_.CalledOnValidThread()); 1722 DCHECK(thread_checker_.CalledOnValidThread());
1729 if (scheduler()) 1723 if (scheduler())
1730 scheduler()->OnConnectionStatusChange(); 1724 scheduler()->OnConnectionStatusChange();
1731 } 1725 }
1732 1726
1733 void SyncManager::SyncInternal::OnServerConnectionEvent( 1727 void SyncManager::SyncInternal::OnServerConnectionEvent(
1734 const ServerConnectionEvent& event) { 1728 const ServerConnectionEvent& event) {
1735 DCHECK(thread_checker_.CalledOnValidThread()); 1729 DCHECK(thread_checker_.CalledOnValidThread());
1736 allstatus_.HandleServerConnectionEvent(event);
1737 if (event.connection_code == 1730 if (event.connection_code ==
1738 browser_sync::HttpResponse::SERVER_CONNECTION_OK) { 1731 browser_sync::HttpResponse::SERVER_CONNECTION_OK) {
1739 FOR_EACH_OBSERVER(SyncManager::Observer, observers_, 1732 FOR_EACH_OBSERVER(SyncManager::Observer, observers_,
1740 OnConnectionStatusChange(CONNECTION_OK)); 1733 OnConnectionStatusChange(CONNECTION_OK));
1741 } 1734 }
1742 1735
1743 if (event.connection_code == browser_sync::HttpResponse::SYNC_AUTH_ERROR) { 1736 if (event.connection_code == browser_sync::HttpResponse::SYNC_AUTH_ERROR) {
1744 observing_ip_address_changes_ = false; 1737 observing_ip_address_changes_ = false;
1745 FOR_EACH_OBSERVER(SyncManager::Observer, observers_, 1738 FOR_EACH_OBSERVER(SyncManager::Observer, observers_,
1746 OnConnectionStatusChange(CONNECTION_AUTH_ERROR)); 1739 OnConnectionStatusChange(CONNECTION_AUTH_ERROR));
(...skipping 742 matching lines...) Expand 10 before | Expand all | Expand 10 after
2489 share->directory->GetDownloadProgress(i.Get(), &marker); 2482 share->directory->GetDownloadProgress(i.Get(), &marker);
2490 2483
2491 if (marker.token().empty()) 2484 if (marker.token().empty())
2492 result.Put(i.Get()); 2485 result.Put(i.Get());
2493 2486
2494 } 2487 }
2495 return result; 2488 return result;
2496 } 2489 }
2497 2490
2498 } // namespace sync_api 2491 } // namespace sync_api
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698