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

Unified Diff: sync/internal_api/sync_manager.cc

Issue 10645004: [Sync] Move HttpBridge to sync/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync to head 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/internal_api/public/sync_manager.h ('k') | sync/internal_api/syncapi_server_connection_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/sync_manager.cc
diff --git a/sync/internal_api/sync_manager.cc b/sync/internal_api/sync_manager.cc
index 25eee06959fa2a3091ac4e35f747abd78cd8c444..eb5a02df6a5193391478c9db18e95bc0926b5080 100644
--- a/sync/internal_api/sync_manager.cc
+++ b/sync/internal_api/sync_manager.cc
@@ -204,7 +204,6 @@ class SyncManager::SyncInternal
csync::ExtensionsActivityMonitor*
extensions_activity_monitor,
ChangeDelegate* change_delegate,
- const std::string& user_agent,
const SyncCredentials& credentials,
csync::SyncNotifier* sync_notifier,
const std::string& restored_key_for_bootstrapping,
@@ -720,7 +719,6 @@ bool SyncManager::Init(
const std::vector<csync::ModelSafeWorker*>& workers,
csync::ExtensionsActivityMonitor* extensions_activity_monitor,
ChangeDelegate* change_delegate,
- const std::string& user_agent,
const SyncCredentials& credentials,
csync::SyncNotifier* sync_notifier,
const std::string& restored_key_for_bootstrapping,
@@ -743,7 +741,6 @@ bool SyncManager::Init(
workers,
extensions_activity_monitor,
change_delegate,
- user_agent,
credentials,
sync_notifier,
restored_key_for_bootstrapping,
@@ -866,7 +863,6 @@ bool SyncManager::SyncInternal::Init(
const std::vector<csync::ModelSafeWorker*>& workers,
csync::ExtensionsActivityMonitor* extensions_activity_monitor,
ChangeDelegate* change_delegate,
- const std::string& user_agent,
const SyncCredentials& credentials,
csync::SyncNotifier* sync_notifier,
const std::string& restored_key_for_bootstrapping,
@@ -905,7 +901,7 @@ bool SyncManager::SyncInternal::Init(
report_unrecoverable_error_function_));
connection_manager_.reset(new SyncAPIServerConnectionManager(
- sync_server_and_path, port, use_ssl, user_agent, post_factory));
+ sync_server_and_path, port, use_ssl, post_factory));
net::NetworkChangeNotifier::AddIPAddressObserver(this);
observing_ip_address_changes_ = true;
« no previous file with comments | « sync/internal_api/public/sync_manager.h ('k') | sync/internal_api/syncapi_server_connection_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698