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

Unified Diff: chrome/browser/ui/webui/help/help_handler.cc

Issue 9413028: Help: Show the platform version and firmware on CrOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review fixes. Created 8 years, 10 months 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/ui/webui/help/help_handler.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..77352cb192c00f7cab74a7b6325b091c847b1853 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,24 @@ 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) {
+ 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) {
+ if (firmware.size()) {
+ scoped_ptr<Value> firmware_string(Value::CreateStringValue(firmware));
+ web_ui()->CallJavascriptFunction("HelpPage.setOSFirmware",
+ *firmware_string);
+ }
+}
+
+#endif // defined(OS_CHROMEOS)
« no previous file with comments | « chrome/browser/ui/webui/help/help_handler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698