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

Unified Diff: chrome/browser/sync/profile_sync_service.cc

Issue 3358028: Revert r59012 which started using Chrome sockets for sync. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 3 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 | « no previous file | chrome/browser/sync/tools/sync_listen_notifications.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index c352dce9842ee6df4d660362cbfd5d6ca4beae3f..2cf676e844658c064ed7acb8f461e951f433c406 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -278,6 +278,12 @@ void ProfileSyncService::InitSettings() {
<< " for test sync notification server.";
}
+ notifier_options_.use_chrome_async_socket =
+ !command_line.HasSwitch(switches::kSyncDisableChromeAsyncSocket);
+ if (notifier_options_.use_chrome_async_socket) {
+ LOG(INFO) << "Using ChromeAsyncSocket";
+ }
+
notifier_options_.try_ssltcp_first =
command_line.HasSwitch(switches::kSyncUseSslTcp);
if (notifier_options_.try_ssltcp_first) {
« no previous file with comments | « no previous file | chrome/browser/sync/tools/sync_listen_notifications.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698