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

Unified Diff: chrome/browser/ui/webui/version_handler_chromeos.cc

Issue 1905113002: Add ARC version to help and version pages (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits Created 4 years, 8 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/version_handler_chromeos.h ('k') | chrome/browser/ui/webui/version_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/version_handler_chromeos.cc
diff --git a/chrome/browser/ui/webui/version_handler_chromeos.cc b/chrome/browser/ui/webui/version_handler_chromeos.cc
index 49cd11eab712e6ee032f3233616ac99c920c0b22..962ace56f216299d446a7882200b65469f585402 100644
--- a/chrome/browser/ui/webui/version_handler_chromeos.cc
+++ b/chrome/browser/ui/webui/version_handler_chromeos.cc
@@ -18,7 +18,7 @@ VersionHandlerChromeOS::~VersionHandlerChromeOS() {
void VersionHandlerChromeOS::HandleRequestVersionInfo(
const base::ListValue* args) {
- // Start the asynchronous load of the version.
+ // Start the asynchronous load of the versions.
base::PostTaskAndReplyWithResult(
content::BrowserThread::GetBlockingPool(),
FROM_HERE,
@@ -26,6 +26,12 @@ void VersionHandlerChromeOS::HandleRequestVersionInfo(
chromeos::version_loader::VERSION_FULL),
base::Bind(&VersionHandlerChromeOS::OnVersion,
weak_factory_.GetWeakPtr()));
+ base::PostTaskAndReplyWithResult(
+ content::BrowserThread::GetBlockingPool(),
+ FROM_HERE,
+ base::Bind(&chromeos::version_loader::GetARCVersion),
+ base::Bind(&VersionHandlerChromeOS::OnARCVersion,
+ weak_factory_.GetWeakPtr()));
// Parent class takes care of the rest.
VersionHandler::HandleRequestVersionInfo(args);
@@ -35,3 +41,8 @@ void VersionHandlerChromeOS::OnVersion(const std::string& version) {
base::StringValue arg(version);
web_ui()->CallJavascriptFunction("returnOsVersion", arg);
}
+
+void VersionHandlerChromeOS::OnARCVersion(const std::string& version) {
+ base::StringValue arg(version);
+ web_ui()->CallJavascriptFunction("returnARCVersion", arg);
+}
« no previous file with comments | « chrome/browser/ui/webui/version_handler_chromeos.h ('k') | chrome/browser/ui/webui/version_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698