summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/webui
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui/webui')
-rw-r--r--chrome/browser/ui/webui/chromeos/register_page_ui.cc13
-rw-r--r--chrome/browser/ui/webui/help/help_handler.cc18
-rw-r--r--chrome/browser/ui/webui/help/help_handler.h8
-rw-r--r--chrome/browser/ui/webui/version_handler_chromeos.cc11
-rw-r--r--chrome/browser/ui/webui/version_handler_chromeos.h5
5 files changed, 30 insertions, 25 deletions
diff --git a/chrome/browser/ui/webui/chromeos/register_page_ui.cc b/chrome/browser/ui/webui/chromeos/register_page_ui.cc
index 5069bc1..a1f7bca 100644
--- a/chrome/browser/ui/webui/chromeos/register_page_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/register_page_ui.cc
@@ -24,7 +24,6 @@
#include "chrome/browser/chromeos/version_loader.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
-#include "chrome/common/cancelable_task_tracker.h"
#include "chrome/common/url_constants.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/web_contents.h"
@@ -130,7 +129,8 @@ class RegisterPageHandler : public WebUIMessageHandler,
void HandleGetUserInfo(const ListValue* args);
// Callback from chromeos::VersionLoader giving the version.
- void OnVersion(const std::string& version);
+ void OnVersion(chromeos::VersionLoader::Handle handle,
+ const std::string& version);
// Skips registration logging |error_msg| with log type ERROR.
void SkipRegistration(const std::string& error_msg);
@@ -142,7 +142,7 @@ class RegisterPageHandler : public WebUIMessageHandler,
chromeos::VersionLoader version_loader_;
// Used to request the version.
- CancelableTaskTracker tracker_;
+ CancelableRequestConsumer version_consumer_;
std::string version_;
@@ -220,15 +220,16 @@ void RegisterPageHandler::HandleGetRegistrationUrl(const ListValue* args) {
void RegisterPageHandler::HandleGetUserInfo(const ListValue* args) {
if (base::chromeos::IsRunningOnChromeOS()) {
version_loader_.GetVersion(
- chromeos::VersionLoader::VERSION_FULL,
+ &version_consumer_,
base::Bind(&RegisterPageHandler::OnVersion, base::Unretained(this)),
- &tracker_);
+ chromeos::VersionLoader::VERSION_FULL);
} else {
SkipRegistration("Not running on ChromeOS.");
}
}
-void RegisterPageHandler::OnVersion(const std::string& version) {
+void RegisterPageHandler::OnVersion(chromeos::VersionLoader::Handle handle,
+ const std::string& version) {
version_ = version;
SendUserInfo();
}
diff --git a/chrome/browser/ui/webui/help/help_handler.cc b/chrome/browser/ui/webui/help/help_handler.cc
index 49d6086..f120545 100644
--- a/chrome/browser/ui/webui/help/help_handler.cc
+++ b/chrome/browser/ui/webui/help/help_handler.cc
@@ -248,13 +248,11 @@ void HelpHandler::Observe(int type, const content::NotificationSource& source,
void HelpHandler::OnPageLoaded(const ListValue* args) {
#if defined(OS_CHROMEOS)
// Version information is loaded from a callback
- loader_.GetVersion(
- chromeos::VersionLoader::VERSION_FULL,
- base::Bind(&HelpHandler::OnOSVersion, base::Unretained(this)),
- &tracker_);
- loader_.GetFirmware(
- base::Bind(&HelpHandler::OnOSFirmware, base::Unretained(this)),
- &tracker_);
+ loader_.GetVersion(&consumer_, base::Bind(&HelpHandler::OnOSVersion,
+ base::Unretained(this)),
+ chromeos::VersionLoader::VERSION_FULL);
+ loader_.GetFirmware(&consumer_, base::Bind(&HelpHandler::OnOSFirmware,
+ base::Unretained(this)));
scoped_ptr<base::Value> can_change_channel_value(
base::Value::CreateBooleanValue(CanChangeReleaseChannel()));
@@ -399,13 +397,15 @@ void HelpHandler::SetPromotionState(VersionUpdater::PromotionState state) {
#endif // defined(OS_MACOSX)
#if defined(OS_CHROMEOS)
-void HelpHandler::OnOSVersion(const std::string& version) {
+void HelpHandler::OnOSVersion(chromeos::VersionLoader::Handle handle,
+ const std::string& version) {
scoped_ptr<Value> version_string(Value::CreateStringValue(version));
web_ui()->CallJavascriptFunction("help.HelpPage.setOSVersion",
*version_string);
}
-void HelpHandler::OnOSFirmware(const std::string& firmware) {
+void HelpHandler::OnOSFirmware(chromeos::VersionLoader::Handle handle,
+ const std::string& firmware) {
scoped_ptr<Value> firmware_string(Value::CreateStringValue(firmware));
web_ui()->CallJavascriptFunction("help.HelpPage.setOSFirmware",
*firmware_string);
diff --git a/chrome/browser/ui/webui/help/help_handler.h b/chrome/browser/ui/webui/help/help_handler.h
index b133fbc..2d5bef7 100644
--- a/chrome/browser/ui/webui/help/help_handler.h
+++ b/chrome/browser/ui/webui/help/help_handler.h
@@ -70,8 +70,10 @@ class HelpHandler : public content::WebUIMessageHandler,
#if defined(OS_CHROMEOS)
// Callbacks from VersionLoader.
- void OnOSVersion(const std::string& version);
- void OnOSFirmware(const std::string& firmware);
+ void OnOSVersion(chromeos::VersionLoader::Handle handle,
+ const std::string& version);
+ void OnOSFirmware(chromeos::VersionLoader::Handle handle,
+ const std::string& firmware);
void OnReleaseChannel(const std::string& channel);
void ProcessLsbFileInfo(
@@ -92,7 +94,7 @@ class HelpHandler : public content::WebUIMessageHandler,
chromeos::VersionLoader loader_;
// Used to request the version.
- CancelableTaskTracker tracker_;
+ CancelableRequestConsumer consumer_;
#endif // defined(OS_CHROMEOS)
DISALLOW_COPY_AND_ASSIGN(HelpHandler);
diff --git a/chrome/browser/ui/webui/version_handler_chromeos.cc b/chrome/browser/ui/webui/version_handler_chromeos.cc
index 637779c..9a0fcf6 100644
--- a/chrome/browser/ui/webui/version_handler_chromeos.cc
+++ b/chrome/browser/ui/webui/version_handler_chromeos.cc
@@ -14,16 +14,17 @@ VersionHandlerChromeOS::~VersionHandlerChromeOS() {
void VersionHandlerChromeOS::HandleRequestVersionInfo(const ListValue* args) {
// Start the asynchronous load of the version.
- loader_.GetVersion(
- chromeos::VersionLoader::VERSION_FULL,
- base::Bind(&VersionHandlerChromeOS::OnVersion, base::Unretained(this)),
- &tracker_);
+ loader_.GetVersion(&consumer_,
+ base::Bind(&VersionHandlerChromeOS::OnVersion,
+ base::Unretained(this)),
+ chromeos::VersionLoader::VERSION_FULL);
// Parent class takes care of the rest.
VersionHandler::HandleRequestVersionInfo(args);
}
-void VersionHandlerChromeOS::OnVersion(const std::string& version) {
+void VersionHandlerChromeOS::OnVersion(chromeos::VersionLoader::Handle handle,
+ const std::string& version) {
StringValue arg(version);
web_ui()->CallJavascriptFunction("returnOsVersion", arg);
}
diff --git a/chrome/browser/ui/webui/version_handler_chromeos.h b/chrome/browser/ui/webui/version_handler_chromeos.h
index 8a7c6d1..cb4ce2f 100644
--- a/chrome/browser/ui/webui/version_handler_chromeos.h
+++ b/chrome/browser/ui/webui/version_handler_chromeos.h
@@ -21,14 +21,15 @@ class VersionHandlerChromeOS : public VersionHandler {
virtual void HandleRequestVersionInfo(const ListValue* args) OVERRIDE;
// Callback from chromeos::VersionLoader giving the version.
- void OnVersion(const std::string& version);
+ void OnVersion(chromeos::VersionLoader::Handle handle,
+ const std::string& version);
private:
// Handles asynchronously loading the version.
chromeos::VersionLoader loader_;
// Used to request the version.
- CancelableTaskTracker tracker_;
+ CancelableRequestConsumer consumer_;
DISALLOW_COPY_AND_ASSIGN(VersionHandlerChromeOS);
};
generated by cgit v1.1 at 2025-05-24 23:29:23 +0000