Chromium Code Reviews| 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..68073900da764bef6474533633b97d890de4337d 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 { |
| @@ -45,10 +45,12 @@ 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); |
| + class UpdateObserver; |
|
stevenjb
2011/11/21 19:28:05
nit: Forward declaration at start of section? (I d
satorux1
2011/11/22 07:33:05
Done.
|
| + static void UpdateSelectedChannel(UpdateObserver* observer, |
| + const std::string& channel); |
| // Handles asynchronously loading the version. |
| VersionLoader loader_; |
| @@ -57,7 +59,6 @@ class AboutPageHandler : public CrosOptionsPageUIHandler { |
| CancelableRequestConsumer consumer_; |
| // Update Observer |
| - class UpdateObserver; |
| scoped_ptr<UpdateObserver> update_observer_; |
| int progress_; |