Help: Show the platform version and firmware on CrOS.

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

 // Copyright (c) 2012 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_handler.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 60 matching lines @@
     { "productCopyright", IDS_ABOUT_VERSION_COPYRIGHT },
     { "updateCheckStarted", IDS_UPGRADE_CHECK_STARTED },
     { "upToDate", IDS_UPGRADE_UP_TO_DATE },
     { "updating", IDS_UPGRADE_UPDATING },
     { "updateAlmostDone", IDS_UPGRADE_SUCCESSFUL_RELAUNCH },
     // TODO(jhawkins): Verify the following UI is only in the official build.
 #if defined(OFFICIAL_BUILD)
     { "getHelpWithChrome",  IDS_GET_HELP_USING_CHROME },
     { "reportAProblem",  IDS_REPORT_A_PROBLEM },
 #endif
+#if defined(OS_CHROMEOS)
+    { "platform", IDS_PLATFORM_LABEL },
+    { "firmware", IDS_ABOUT_PAGE_FIRMWARE },
+#endif
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(resources); ++i) {
     localized_strings->SetString(resources[i].name,
                                  l10n_util::GetStringUTF16(resources[i].ids));
   }
 
   localized_strings->SetString(
       "browserVersion",
       l10n_util::GetStringFUTF16(IDS_ABOUT_PRODUCT_VERSION,
                                  BuildBrowserVersionString()));
 
   string16 license = l10n_util::GetStringFUTF16(
       IDS_ABOUT_VERSION_LICENSE,
 #if !defined(OS_CHROMEOS)
       UTF8ToUTF16(google_util::StringAppendGoogleLocaleParam(
           chrome::kChromiumProjectURL)),
 #endif
       ASCIIToUTF16(chrome::kChromeUICreditsURL));
   localized_strings->SetString("productLicense", license);
 
   string16 tos = l10n_util::GetStringFUTF16(
       IDS_ABOUT_TERMS_OF_SERVICE, UTF8ToUTF16(chrome::kChromeUITermsURL));
   localized_strings->SetString("productTOS", tos);
 }
 
 void HelpHandler::RegisterMessages() {
-  web_ui()->RegisterMessageCallback("checkForUpdate",
-      base::Bind(&HelpHandler::CheckForUpdate, base::Unretained(this)));
+  web_ui()->RegisterMessageCallback("onPageLoaded",
+      base::Bind(&HelpHandler::OnPageLoaded, base::Unretained(this)));
   web_ui()->RegisterMessageCallback("relaunchNow",
       base::Bind(&HelpHandler::RelaunchNow, base::Unretained(this)));
 }
 
-void HelpHandler::CheckForUpdate(const ListValue* args) {
+void HelpHandler::OnPageLoaded(const ListValue* args) {
+  #if defined(OS_CHROMEOS)
+  // Version information is loaded from a callback
+  loader_.GetVersion(&consumer_, base::Bind(&HelpHandler::OnOSVersion,
+                                            base::Unretained(this)),
+                     chromeos::VersionLoader::VERSION_FULL);
+  loader_.GetFirmware(&consumer_, base::Bind(&HelpHandler::OnOSFirmware,
+                                             base::Unretained(this)));
+#endif  // defined(OS_CHROMEOS)
+
   version_updater_->CheckForUpdate(
       base::Bind(&HelpHandler::UpdateStatus, base::Unretained(this)));
 }
 
 void HelpHandler::RelaunchNow(const ListValue* args) {
   version_updater_->RelaunchBrowser();
 }
 
 void HelpHandler::UpdateStatus(VersionUpdater::Status status, int progress) {
   // Only UPDATING state should have progress set.
@@ skipping 16 matching lines @@
   }
 
   scoped_ptr<Value> status_value(Value::CreateStringValue(status_str));
   web_ui()->CallJavascriptFunction("HelpPage.setUpdateStatus", *status_value);
 
   if (status == VersionUpdater::UPDATING) {
     scoped_ptr<Value> progress_value(Value::CreateIntegerValue(progress));
     web_ui()->CallJavascriptFunction("HelpPage.setProgress", *progress_value);
   }
 }
+
+#if defined(OS_CHROMEOS)
+
+void HelpHandler::OnOSVersion(chromeos::VersionLoader::Handle handle,
+                              std::string version) {
+  version = std::string("130.0.0 (Official Build) dev-channel-stumpy");

[csilv, 2012/02/17 01:21:49]

You can get rid of this placeholder string.

[James Hawkins, 2012/02/17 01:29:27]

Done.

+  if (version.size()) {
+    scoped_ptr<Value> version_string(Value::CreateStringValue(version));
+    web_ui()->CallJavascriptFunction("HelpPage.setOSVersion", *version_string);
+  }
+}
+
+void HelpHandler::OnOSFirmware(chromeos::VersionLoader::Handle handle,
+                               std::string firmware) {
+  firmware = std::string("Google_stumpy 2.59.0");

[csilv, 2012/02/17 01:21:49]

this one too

[James Hawkins, 2012/02/17 01:29:27]

Done.

+  if (firmware.size()) {
+    scoped_ptr<Value> firmware_string(Value::CreateStringValue(firmware));
+    web_ui()->CallJavascriptFunction("HelpPage.setOSFirmware",
+                                     *firmware_string);
+  }
+}
+
+#endif // defined(OS_CHROMEOS)