Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1998)

Unified Diff: chrome/browser/sync/sync_ui_util.cc

Issue 8590030: Revert "[Sync] Add version info to about:sync" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/sync_ui_util.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/sync_ui_util.cc
diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc
index 2bfd6c62140ce6cc203827622f8a780cc182cd44..7264b48addc47d9d5180c074389d9cfa0e5baca4 100644
--- a/chrome/browser/sync/sync_ui_util.cc
+++ b/chrome/browser/sync/sync_ui_util.cc
@@ -18,7 +18,6 @@
#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"
@@ -492,7 +491,6 @@ void ConstructAboutInformation(ProfileSyncService* service,
ProfileSyncService::BuildSyncStatusSummaryText(
full_status.summary));
- strings->SetString("version", GetVersionString());
strings->Set("authenticated",
new base::FundamentalValue(full_status.authenticated));
strings->SetString("auth_problem",
@@ -507,10 +505,6 @@ void ConstructAboutInformation(ProfileSyncService* service,
service->sync_initialized());
sync_ui_util::AddBoolSyncDetail(details, "Sync Setup Has Completed",
service->HasSyncSetupCompleted());
- sync_ui_util::AddStringSyncDetails(
- details,
- "Client ID",
- full_status.unique_id.empty() ? "none" : full_status.unique_id);
sync_ui_util::AddBoolSyncDetail(details,
"Server Up",
full_status.server_up);
@@ -669,28 +663,4 @@ void ConstructAboutInformation(ProfileSyncService* service,
}
}
-std::string GetVersionString() {
- // Build a version string that matches MakeUserAgentForSyncApi with the
- // addition of channel info and proper OS names.
- chrome::VersionInfo chrome_version;
- if (!chrome_version.is_valid())
- return "invalid";
- // GetVersionStringModifier returns empty string for stable channel or
- // unofficial builds, the channel string otherwise. We want to have "-devel"
- // for unofficial builds only.
- std::string version_modifier =
- chrome::VersionInfo::GetVersionStringModifier();
- if (version_modifier.empty()) {
- if (chrome::VersionInfo::GetChannel() !=
- chrome::VersionInfo::CHANNEL_STABLE) {
- version_modifier = "-devel";
- }
- } else {
- version_modifier = " " + version_modifier;
- }
- return chrome_version.Name() + " " + chrome_version.OSType() + " " +
- chrome_version.Version() + " (" + chrome_version.LastChange() + ")" +
- version_modifier;
-}
-
} // namespace sync_ui_util
« no previous file with comments | « chrome/browser/sync/sync_ui_util.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698