| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/browser/sync/profile_sync_service.h" | 5 #include "chrome/browser/sync/profile_sync_service.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 | 9 |
| 10 #include "app/l10n_util.h" | 10 #include "app/l10n_util.h" |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 NotificationService::AllSources()); | 79 NotificationService::AllSources()); |
| 80 registrar_.Add(this, | 80 registrar_.Add(this, |
| 81 NotificationType::SYNC_PASSPHRASE_ACCEPTED, | 81 NotificationType::SYNC_PASSPHRASE_ACCEPTED, |
| 82 NotificationService::AllSources()); | 82 NotificationService::AllSources()); |
| 83 | 83 |
| 84 // By default, dev & chromium users will go to the development servers. | 84 // By default, dev & chromium users will go to the development servers. |
| 85 // Dev servers have more features than standard sync servers. | 85 // Dev servers have more features than standard sync servers. |
| 86 // Chrome stable and beta builds will go to the standard sync servers. | 86 // Chrome stable and beta builds will go to the standard sync servers. |
| 87 #if defined(GOOGLE_CHROME_BUILD) | 87 #if defined(GOOGLE_CHROME_BUILD) |
| 88 // For stable, this is "". For dev, this is "dev". For beta, this is "beta". | 88 // For stable, this is "". For dev, this is "dev". For beta, this is "beta". |
| 89 // For daily, this is "canary build". |
| 89 // For linux Chromium builds, this could be anything depending on the | 90 // For linux Chromium builds, this could be anything depending on the |
| 90 // distribution, so always direct those users to dev server urls. | 91 // distribution, so always direct those users to dev server urls. |
| 91 // If this is an official build, it will always be one of the above. | 92 // If this is an official build, it will always be one of the above. |
| 92 string16 channel = platform_util::GetVersionStringModifier(); | 93 string16 channel = platform_util::GetVersionStringModifier(); |
| 93 if (channel.empty() || channel == ASCIIToUTF16("beta")) { | 94 if (channel.empty() || channel == ASCIIToUTF16("beta")) { |
| 94 LOG(INFO) << "Detected official build, using official sync server."; | 95 LOG(INFO) << "Detected official build, using official sync server."; |
| 95 sync_service_url_ = GURL(kSyncServerUrl); | 96 sync_service_url_ = GURL(kSyncServerUrl); |
| 96 } else { | 97 } else { |
| 97 LOG(INFO) << "Detected official build, but using dev channel sync server."; | 98 LOG(INFO) << "Detected official build, but using dev channel sync server."; |
| 98 } | 99 } |
| (...skipping 682 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 781 // is initialized, all enabled data types are consistent with one | 782 // is initialized, all enabled data types are consistent with one |
| 782 // another, and no unrecoverable error has transpired. | 783 // another, and no unrecoverable error has transpired. |
| 783 if (unrecoverable_error_detected_) | 784 if (unrecoverable_error_detected_) |
| 784 return false; | 785 return false; |
| 785 | 786 |
| 786 if (!data_type_manager_.get()) | 787 if (!data_type_manager_.get()) |
| 787 return false; | 788 return false; |
| 788 | 789 |
| 789 return data_type_manager_->state() == DataTypeManager::CONFIGURED; | 790 return data_type_manager_->state() == DataTypeManager::CONFIGURED; |
| 790 } | 791 } |
| OLD | NEW |