diff options
Diffstat (limited to 'chrome/browser/sync')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service.cc | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index 814e06e..3c6a4cf 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -86,22 +86,18 @@ ProfileSyncService::ProfileSyncService(ProfileSyncFactory* factory, NotificationType::SYNC_DATA_TYPES_UPDATED, Source<Profile>(profile)); - // By default, dev & chromium users will go to the development servers. - // Dev servers have more features than standard sync servers. - // Chrome stable and beta builds will go to the standard sync servers. -#if defined(GOOGLE_CHROME_BUILD) - // GetVersionStringModifier hits the registry. See http://crbug.com/70380. + // By default, dev, canary, and unbranded Chromium users will go to the + // development servers. Development servers have more features than standard + // sync servers. Users with officially-branded Chrome stable and beta builds + // will go to the standard sync servers. + // + // GetChannel hits the registry on Windows. See http://crbug.com/70380. base::ThreadRestrictions::ScopedAllowIO allow_io; - // For stable, this is "". For dev, this is "dev". For beta, this is "beta". - // For daily, this is "canary". - // For Linux Chromium builds, this could be anything depending on the - // distribution, so always direct those users to dev server urls. - // If this is an official build, it will always be one of the above. - std::string channel = platform_util::GetVersionStringModifier(); - if (channel.empty() || channel == "beta") { + platform_util::Channel channel = platform_util::GetChannel(); + if (channel == platform_util::CHANNEL_STABLE || + channel == platform_util::CHANNEL_BETA) { sync_service_url_ = GURL(kSyncServerUrl); } -#endif tried_implicit_gaia_remove_when_bug_62103_fixed_ = false; } |