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

Unified Diff: chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h

Issue 8386031: Move chromeos_mount.cc from libcros to Chrome tree (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleaned up format Created 9 years, 1 month 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
Index: chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h
diff --git a/chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h b/chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h
index 281cf98e4306dd966be24c9f69d1d5f8926bd6d8..661cfc86092a5fbb07d28b4589dade937a506716 100644
--- a/chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h
+++ b/chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h
@@ -14,8 +14,8 @@
#include "base/values.h"
#include "chrome/browser/chromeos/cros/burn_library.h"
#include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/cros/mount_library.h"
#include "chrome/browser/chromeos/cros/network_library.h"
+#include "chrome/browser/chromeos/dbus/cros_disks_client.h"
#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
#include "chrome/browser/ui/webui/chromeos/imageburner/imageburner_utils.h"
#include "content/browser/download/download_item.h"
@@ -75,7 +75,7 @@ class WebUIHandlerTaskProxy
class WebUIHandler
: public WebUIMessageHandler,
- public chromeos::MountLibrary::Observer,
+ public chromeos::CrosDisksClient::Observer,
public chromeos::BurnLibrary::Observer,
public chromeos::NetworkLibrary::NetworkManagerObserver,
public DownloadItem::Observer,
@@ -92,15 +92,16 @@ class WebUIHandler
virtual WebUIMessageHandler* Attach(WebUI* web_ui) OVERRIDE;
virtual void RegisterMessages() OVERRIDE;
- // chromeos::MountLibrary::Observer interface.
- virtual void DiskChanged(chromeos::MountLibraryEventType event,
- const chromeos::MountLibrary::Disk* disk) OVERRIDE;
- virtual void DeviceChanged(chromeos::MountLibraryEventType event,
+ // chromeos::CrosDisksClient::Observer interface.
+ virtual void DiskChanged(chromeos::CrosDisksClientEventType event,
+ const chromeos::CrosDisksClient::Disk* disk)
+ OVERRIDE;
+ virtual void DeviceChanged(chromeos::CrosDisksClientEventType event,
const std::string& device_path) OVERRIDE {
}
- virtual void MountCompleted(chromeos::MountLibrary::MountEvent event_type,
+ virtual void MountCompleted(chromeos::CrosDisksClient::MountEvent event_type,
chromeos::MountError error_code,
- const chromeos::MountLibrary::MountPointInfo& mount_info) OVERRIDE {
+ const chromeos::CrosDisksClient::MountPointInfo& mount_info) OVERRIDE {
}
// chromeos::BurnLibrary::Observer interface.
@@ -127,8 +128,8 @@ class WebUIHandler
virtual void OnError(int error_message_id) OVERRIDE;
private:
- void CreateDiskValue(const chromeos::MountLibrary::Disk& disk,
- DictionaryValue* disk_value);
+ void CreateDiskValue(const chromeos::CrosDisksClient::Disk& disk,
+ DictionaryValue* disk_value);
// Callback for the "getRoots" message.
void HandleGetDevices(const ListValue* args);
@@ -212,4 +213,3 @@ class WebUIHandler
} // namespace imageburner.
#endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_IMAGEBURNER_WEBUI_HANDLER_H_
-

Powered by Google App Engine
This is Rietveld 408576698