Integrate About page into Settings for Chrome OS settings in a window.

chrome/browser/ui/webui/help/help_utils.cc

 // Copyright 2013 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/ui/webui/help/help_utils_chromeos.h"
-
-#include <algorithm>
+#include "chrome/browser/ui/webui/help/help_utils.h"
 
 #include "base/logging.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/common/chrome_version_info.h"
+
+#if defined(OS_CHROMEOS)

[Dan Beam, 2014/08/13 02:50:46]

i doesn't make a ton of sense to me to rename from help_utils_chromeos =>
help_utils then add a ton of #ifdef soup.

either way, probably better in a separate CL.

[michaelpg, 2014/08/13 08:12:11]

ok. This might as well go in help_utils_chromes anyway at this point.

 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chromeos/network/network_type_pattern.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
+#endif
 
+#if defined(OS_CHROMEOS)
 namespace {
 
 const bool kDefaultUpdateOverCellularAllowed = false;
 
 }  // namespace
+#endif
 
-namespace help_utils_chromeos {
+namespace help_utils {
 
+base::string16 BuildBrowserVersionString() {
+  chrome::VersionInfo version_info;
+  DCHECK(version_info.is_valid());
+
+  std::string browser_version = version_info.Version();
+  std::string version_modifier =
+      chrome::VersionInfo::GetVersionStringModifier();
+  if (!version_modifier.empty())
+    browser_version += " " + version_modifier;
+
+#if !defined(GOOGLE_CHROME_BUILD)
+  browser_version += " (";
+  browser_version += version_info.LastChange();
+  browser_version += ")";
+#endif
+
+#if defined(ARCH_CPU_64_BITS)
+  browser_version += " (64-bit)";
+#endif
+
+  return base::UTF8ToUTF16(browser_version);
+}
+
+#if defined(OS_CHROMEOS)
 bool IsUpdateOverCellularAllowed() {
   chromeos::CrosSettings* settings = chromeos::CrosSettings::Get();
   if (!settings)
     return kDefaultUpdateOverCellularAllowed;
 
   const base::Value* raw_types_value =
       settings->GetPref(chromeos::kAllowedConnectionTypesForUpdate);
   if (!raw_types_value)
     return kDefaultUpdateOverCellularAllowed;
   const base::ListValue* types_value;
@@ skipping 19 matching lines @@
     return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_WIMAX);
   if (type == shill::kTypeBluetooth)
     return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_BLUETOOTH);
   if (type == shill::kTypeCellular)
     return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_CELLULAR);
   if (type == shill::kTypeVPN)
     return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_VPN);
   NOTREACHED();
   return base::string16();
 }
+#endif  // OS_CHROMEOS
 
-}  // namespace help_utils_chromeos
+}  // namespace help_utils