diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-01 04:28:04 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-01 04:28:04 +0000 |
| commit | 714830605619742dfb7fa36528cd584f2c140582 (patch) | |
| tree | ba05870e1549e61c6053f196113364f35a48d0c7 /chrome | |
| parent | 695c2f08da8904bcd5e9e9b56aff1754de8d6bb9 (diff) | |
| download | chromium_src-714830605619742dfb7fa36528cd584f2c140582.zip chromium_src-714830605619742dfb7fa36528cd584f2c140582.tar.gz chromium_src-714830605619742dfb7fa36528cd584f2c140582.tar.bz2 | |
Use ChromeAsyncSocket by default.
Removed --sync-use-chrome-async-socket switch, added
--sync-disable-chrome-async-socket switch.
BUG=45612
TEST=manually
Review URL: http://codereview.chromium.org/3304001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58123 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service.cc | 2 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.cc | 9 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index 15a530d..5732ebf 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -212,7 +212,7 @@ void ProfileSyncService::InitSettings() { LOG(INFO) << "Using " << sync_service_url_ << " for sync server URL."; use_chrome_async_socket_ = - command_line.HasSwitch(switches::kSyncUseChromeAsyncSocket); + !command_line.HasSwitch(switches::kSyncDisableChromeAsyncSocket); if (use_chrome_async_socket_) { LOG(INFO) << "Using ChromeAsyncSocket"; } diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index d6cace2..ad1ef4b 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -985,6 +985,11 @@ const char kStartMaximized[] = "start-maximized"; // Control Sync XMPP client settings. const char kSyncAllowPlain[] = "allow-plain"; +// Disable the Chrome-socket-based buzz::AsyncSocket implementation +// for sync notifications, instead using libjingle sockets. +const char kSyncDisableChromeAsyncSocket[] = + "sync-disable-chrome-async-socket"; + // Control Sync XMPP client settings. const char kSyncDisableTls[] = "disable-tls"; @@ -1012,10 +1017,6 @@ const char kSyncServer[] = "server"; // Override the default server used for profile sync. const char kSyncServiceURL[] = "sync-url"; -// Use the (new, untested) Chrome-socket-based buzz::AsyncSocket -// implementation for notifications. -const char kSyncUseChromeAsyncSocket[] = "sync-use-chrome-async-socket"; - // Control Sync XMPP client settings. const char kSyncUseSslTcp[] = "use-ssl-tcp"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index f6f4025..9cab59b 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -279,6 +279,7 @@ extern const char kSimpleDataSource[]; extern const char kSingleProcess[]; extern const char kStartMaximized[]; extern const char kSyncAllowPlain[]; +extern const char kSyncDisableChromeAsyncSocket[]; extern const char kSyncDisableTls[]; extern const char kSyncEmail[]; extern const char kSyncerThreadTimedStop[]; @@ -287,7 +288,6 @@ extern const char kSyncPassword[]; extern const char kSyncPort[]; extern const char kSyncServer[]; extern const char kSyncServiceURL[]; -extern const char kSyncUseChromeAsyncSocket[]; extern const char kSyncUseSslTcp[]; extern const char kSyncUseCacheInvalidation[]; extern const char kTestNaClSandbox[]; |