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

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

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/resources/help/help.js ('k') | chrome/browser/ui/webui/help/help_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/help/help_handler.h
diff --git a/chrome/browser/ui/webui/help/help_handler.h b/chrome/browser/ui/webui/help/help_handler.h
index 539bdd119e69cd7004572c19ea6a1b9eb9b2cff8..e507c510144c53b281d2223efbe81aa23727c1b2 100644
--- a/chrome/browser/ui/webui/help/help_handler.h
+++ b/chrome/browser/ui/webui/help/help_handler.h
@@ -11,6 +11,10 @@
#include "chrome/browser/ui/webui/help/version_updater.h"
#include "content/public/browser/web_ui_message_handler.h"
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/version_loader.h"
+#endif // defined(OS_CHROMEOS)
+
// WebUI message handler for the help page.
class HelpHandler : public content::WebUIMessageHandler {
public:
@@ -24,8 +28,8 @@ class HelpHandler : public content::WebUIMessageHandler {
void GetLocalizedValues(base::DictionaryValue* localized_strings);
private:
- // Initiates the update process.
- void CheckForUpdate(const base::ListValue* args);
+ // Initializes querying values for the page.
+ void OnPageLoaded(const base::ListValue* args);
// Relaunches the browser.
void RelaunchNow(const base::ListValue* args);
@@ -33,9 +37,24 @@ class HelpHandler : public content::WebUIMessageHandler {
// Callback method which forwards status updates to the page.
void UpdateStatus(VersionUpdater::Status status, int progress);
+#if defined(OS_CHROMEOS)
+ // Callbacks from VersionLoader.
+ void OnOSVersion(chromeos::VersionLoader::Handle handle, std::string version);
+ void OnOSFirmware(chromeos::VersionLoader::Handle handle,
+ std::string firmware);
+#endif
+
// Specialized instance of the VersionUpdater used to update the browser.
scoped_ptr<VersionUpdater> version_updater_;
+#if defined(OS_CHROMEOS)
+ // Handles asynchronously loading the CrOS version info.
+ chromeos::VersionLoader loader_;
+
+ // Used to request the version.
+ CancelableRequestConsumer consumer_;
+#endif // defined(OS_CHROMEOS)
+
DISALLOW_COPY_AND_ASSIGN(HelpHandler);
};
« no previous file with comments | « chrome/browser/resources/help/help.js ('k') | chrome/browser/ui/webui/help/help_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698