Index: chrome/browser/ui/webui/options/chromeos/about_page_handler.h |
diff --git a/chrome/browser/ui/webui/options/chromeos/about_page_handler.h b/chrome/browser/ui/webui/options/chromeos/about_page_handler.h |
index aed7616d55a4783e6a2abeb4a232bd9ae670487e..a33ee75d770fd5959e6bedaebf7a578fc537f225 100644 |
--- a/chrome/browser/ui/webui/options/chromeos/about_page_handler.h |
+++ b/chrome/browser/ui/webui/options/chromeos/about_page_handler.h |
@@ -10,7 +10,7 @@ |
#include "chrome/browser/ui/webui/options/options_ui.h" |
#include "chrome/browser/ui/webui/options/chromeos/cros_options_page_ui_handler.h" |
-#include "chrome/browser/chromeos/cros/update_library.h" |
+#include "chrome/browser/chromeos/dbus/update_engine_client.h" |
#include "chrome/browser/chromeos/version_loader.h" |
namespace chromeos { |
@@ -27,6 +27,8 @@ class AboutPageHandler : public CrosOptionsPageUIHandler { |
virtual void RegisterMessages(); |
private: |
+ class UpdateObserver; |
+ |
// The function is called from JavaScript when the about page is ready. |
void PageReady(const base::ListValue* args); |
@@ -45,10 +47,11 @@ class AboutPageHandler : public CrosOptionsPageUIHandler { |
std::string version); |
void OnOSFirmware(VersionLoader::Handle handle, |
std::string firmware); |
- void UpdateStatus(const UpdateLibrary::Status& status); |
+ void UpdateStatus(const UpdateEngineClient::Status& status); |
// UpdateEngine Callback handler. |
- static void UpdateSelectedChannel(void* user_data, const char* channel); |
+ static void UpdateSelectedChannel(UpdateObserver* observer, |
+ const std::string& channel); |
// Handles asynchronously loading the version. |
VersionLoader loader_; |
@@ -57,7 +60,6 @@ class AboutPageHandler : public CrosOptionsPageUIHandler { |
CancelableRequestConsumer consumer_; |
// Update Observer |
- class UpdateObserver; |
scoped_ptr<UpdateObserver> update_observer_; |
int progress_; |