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

Side by Side Diff: chrome/browser/sync/glue/sync_backend_host.cc

Issue 12092091: Separate sync and invalidation client IDs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #include "chrome/browser/sync/glue/sync_backend_host.h" 7 #include "chrome/browser/sync/glue/sync_backend_host.h"
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <map> 10 #include <map>
(...skipping 1167 matching lines...) Expand 10 before | Expand all | Expand 10 after
1178 options.registrar /* as SyncManager::ChangeDelegate */, 1178 options.registrar /* as SyncManager::ChangeDelegate */,
1179 options.credentials, 1179 options.credentials,
1180 #if defined(OS_ANDROID) 1180 #if defined(OS_ANDROID)
1181 scoped_ptr<syncer::Invalidator>( 1181 scoped_ptr<syncer::Invalidator>(
1182 new AndroidInvalidatorBridgeProxy( 1182 new AndroidInvalidatorBridgeProxy(
1183 options.android_invalidator_bridge)), 1183 options.android_invalidator_bridge)),
1184 #else 1184 #else
1185 scoped_ptr<syncer::Invalidator>( 1185 scoped_ptr<syncer::Invalidator>(
1186 options.invalidator_factory->CreateInvalidator()), 1186 options.invalidator_factory->CreateInvalidator()),
1187 #endif 1187 #endif
1188 options.invalidator_factory->GetInvalidatorClientId(),
1188 options.restored_key_for_bootstrapping, 1189 options.restored_key_for_bootstrapping,
1189 options.restored_keystore_key_for_bootstrapping, 1190 options.restored_keystore_key_for_bootstrapping,
1190 scoped_ptr<InternalComponentsFactory>( 1191 scoped_ptr<InternalComponentsFactory>(
1191 options.internal_components_factory), 1192 options.internal_components_factory),
1192 &encryptor_, 1193 &encryptor_,
1193 options.unrecoverable_error_handler, 1194 options.unrecoverable_error_handler,
1194 options.report_unrecoverable_error_function); 1195 options.report_unrecoverable_error_function);
1195 1196
1196 // |sync_manager_| may end up being NULL here in tests (in 1197 // |sync_manager_| may end up being NULL here in tests (in
1197 // synchronous initialization mode). 1198 // synchronous initialization mode).
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
1633 DVLOG(1) << "Connection status changed: " 1634 DVLOG(1) << "Connection status changed: "
1634 << syncer::ConnectionStatusToString(status); 1635 << syncer::ConnectionStatusToString(status);
1635 frontend_->OnConnectionStatusChange(status); 1636 frontend_->OnConnectionStatusChange(status);
1636 } 1637 }
1637 1638
1638 #undef SDVLOG 1639 #undef SDVLOG
1639 1640
1640 #undef SLOG 1641 #undef SLOG
1641 1642
1642 } // namespace browser_sync 1643 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/android_invalidator_bridge_proxy.cc ('k') | chrome/browser/sync/invalidations/invalidator_storage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698