diff options
| -rw-r--r-- | chrome/browser/browser_about_handler.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/sync/profile_sync_service.cc | 12 | ||||
| -rw-r--r-- | chrome/browser/sync/profile_sync_service.h | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/resources/about_sync.html | 6 |
4 files changed, 9 insertions, 12 deletions
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index 3f9abc2..8bc83f4 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -719,6 +719,7 @@ std::string AboutSync() { } else { SyncManager::Status full_status(service->QueryDetailedSyncStatus()); + strings.SetString("service_url", service->sync_service_url().spec()); strings.SetString("summary", ProfileSyncService::BuildSyncStatusSummaryText( full_status.summary)); diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index c344b83..277eaed 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -90,13 +90,8 @@ ProfileSyncService::ProfileSyncService(ProfileSyncFactory* factory, // 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") { - LOG(INFO) << "Detected official build, using official sync server."; sync_service_url_ = GURL(kSyncServerUrl); - } else { - LOG(INFO) << "Detected official build, but using dev channel sync server."; } -#else - LOG(INFO) << "Unofficial build, using dev channel sync server."; #endif } @@ -149,7 +144,6 @@ void ProfileSyncService::LoadMigratedCredentials(const std::string& username, } void ProfileSyncService::Initialize() { - LOG(INFO) << "Starting ProfileSyncService."; InitSettings(); RegisterPreferences(); @@ -256,8 +250,6 @@ void ProfileSyncService::InitSettings() { } } - LOG(INFO) << "Using " << sync_service_url_ << " for sync server URL."; - // Override the notification server host from the command-line, if provided. if (command_line.HasSwitch(switches::kSyncNotificationHost)) { std::string value(command_line.GetSwitchValueASCII( @@ -386,8 +378,6 @@ void ProfileSyncService::StartUp() { DCHECK(AreCredentialsAvailable()); - LOG(INFO) << "ProfileSyncService bringing up backend host."; - last_synced_time_ = base::Time::FromInternalValue( profile_->GetPrefs()->GetInt64(prefs::kSyncLastSyncedTime)); @@ -436,8 +426,6 @@ void ProfileSyncService::ClearServerData() { } void ProfileSyncService::DisableForUser() { - LOG(INFO) << "Disabling sync for user."; - // Clear prefs (including SyncSetupHasCompleted) before shutting down so // PSS clients don't think we're set up while we're shutting down. ClearPreferences(); diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h index 2b25e0c..63c04b8 100644 --- a/chrome/browser/sync/profile_sync_service.h +++ b/chrome/browser/sync/profile_sync_service.h @@ -325,6 +325,8 @@ class ProfileSyncService : public browser_sync::SyncFrontend, // any model-modifying operations. bool ShouldPushChanges(); + const GURL& sync_service_url() const { return sync_service_url_; } + protected: // Used by ProfileSyncServiceMock only. // diff --git a/chrome/browser/sync/resources/about_sync.html b/chrome/browser/sync/resources/about_sync.html index c65a7bb..6f62f5d 100644 --- a/chrome/browser/sync/resources/about_sync.html +++ b/chrome/browser/sync/resources/about_sync.html @@ -157,6 +157,12 @@ table.list#details .name { </div> </td> </tr> + <tr> + <td colspan="2"> + <span class="desc"><h2> Sync URL </h2></span> + <strong jscontent="service_url"></strong> + </td> + </tr> </table> <br /><br /><br /> <h2> </h2> |