[Sync] Add version info to about:sync

chrome/browser/sync/sync_ui_util.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/sync_ui_util.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/time_formatting.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/protocol/proto_enum_conversions.h"
 #include "chrome/browser/sync/protocol/sync_protocol_error.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/browser/sync/sessions/session_state.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/chrome_version_info.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "chrome/common/url_constants.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 typedef GoogleServiceAuthError AuthError;
@@ skipping 453 matching lines @@
     strings->SetString("summary", "SYNC DISABLED");
   } else {
     sync_api::SyncManager::Status full_status(
         service->QueryDetailedSyncStatus());
 
     strings->SetString("service_url", service->sync_service_url().spec());
     strings->SetString("summary",
                        ProfileSyncService::BuildSyncStatusSummaryText(
                        full_status.summary));
 
+    chrome::VersionInfo chrome_version;
+    strings->SetString("version", chrome_version.Name() + " " +

[akalin, 2011/11/17 02:35:02]

Does this have more information than the user agent?  (See
content::GetUserAgent() from content/public/common/content_client.h, and its use
in sync_backend_hsot.cc).

I would prefer the user agent, as it can be more easily compared with server
logs, etc.

WDYT?

[Nicolas Zea, 2011/11/17 03:59:16]

Hmm, wasn't aware of that. Interestingly, sync_backend_host.cc uses both the
content_client's GetUserAgent, as well as a special user agent for syncapi that
also makes use of VersionInfo (see MakeUserAgentForSyncApi). The string here is
almost the same as the syncapi user agent, with the exception that I also add
the channel, which I think is worth keeping around. I've gone ahead and matched
their formats though.

The content_client user agent specifies a lot more than we care to display
(webkit version, mozilla/safari things, etc.), and does not include the channel.

In addition, the server logs are keyed primarily off the cached_guid, which is
in neither of the above, but would be useful to provide. Added as a separate
field.

+        chrome_version.Version() + " (" + chrome_version.OSType() + ") " +
+        chrome_version.GetVersionStringModifier());
     strings->Set("authenticated",
                  new base::FundamentalValue(full_status.authenticated));
     strings->SetString("auth_problem",
                        sync_ui_util::MakeSyncAuthErrorText(
                        service->GetAuthError().state()));
 
     strings->SetString("time_since_sync", service->GetLastSyncedTimeString());
 
     ListValue* details = new ListValue();
     strings->Set("details", details);
@@ skipping 153 matching lines @@
         DictionaryValue* val = new DictionaryValue;
         val->SetString("model_type", ModelTypeToString(it->first));
         val->SetString("group", ModelSafeGroupToString(it->second));
         routing_info->Append(val);
       }
     }
   }
 }
 
 }  // namespace sync_ui_util