Help: Show the platform version and firmware on CrOS.

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

Index: chrome/browser/ui/webui/help/help_handler.cc
diff --git a/chrome/browser/ui/webui/help/help_handler.cc b/chrome/browser/ui/webui/help/help_handler.cc
index 8747f6ad30c3dda815d7de06e0d945bd29ee2f6e..5192bf1388cd93e5c3c85670b0df3bec87584bc0 100644
--- a/chrome/browser/ui/webui/help/help_handler.cc
+++ b/chrome/browser/ui/webui/help/help_handler.cc
@@ -78,6 +78,10 @@ void HelpHandler::GetLocalizedValues(DictionaryValue* localized_strings) {
     { "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) {
@@ -105,13 +109,22 @@ void HelpHandler::GetLocalizedValues(DictionaryValue* localized_strings) {
 }
 
 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)));
 }
@@ -148,3 +161,26 @@ void HelpHandler::UpdateStatus(VersionUpdater::Status status, int 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)