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

Unified Diff: chrome/browser/chromeos/cros/mount_library.h

Issue 7706028: This is UI side unreadable device support. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: merging conflict Created 9 years, 4 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/app/generated_resources.grd ('k') | chrome/browser/chromeos/cros/mount_library.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/cros/mount_library.h
diff --git a/chrome/browser/chromeos/cros/mount_library.h b/chrome/browser/chromeos/cros/mount_library.h
index 688c8b1848b18545c0332506cf5e7d955f3d98db..8108f442faa607b109fef504ebde6d8eae73d66d 100644
--- a/chrome/browser/chromeos/cros/mount_library.h
+++ b/chrome/browser/chromeos/cros/mount_library.h
@@ -29,6 +29,12 @@ typedef enum MountLibraryEventType {
MOUNT_FORMATTING_FINISHED
} MountLibraryEventType;
+typedef enum MountCondition {
+ MOUNT_CONDITION_NONE,
+ MOUNT_CONDITION_UNKNOWN_FILESYSTEM,
+ MOUNT_CONDITION_UNSUPPORTED_FILESYSTEM
+} MountCondition;
+
class MountLibcrosProxy {
public:
virtual ~MountLibcrosProxy() {}
@@ -135,11 +141,14 @@ class MountLibrary {
std::string source_path;
std::string mount_path;
MountType mount_type;
+ MountCondition mount_condition;
- MountPointInfo(const char* source, const char* mount, const MountType type)
+ MountPointInfo(const char* source, const char* mount, const MountType type,
+ MountCondition condition)
: source_path(source ? source : ""),
mount_path(mount ? mount : ""),
- mount_type(type) {
+ mount_type(type),
+ mount_condition(condition) {
}
};
@@ -155,7 +164,7 @@ class MountLibrary {
virtual void DiskChanged(MountLibraryEventType event,
const Disk* disk) = 0;
virtual void DeviceChanged(MountLibraryEventType event,
- const std::string& device_path ) = 0;
+ const std::string& device_path) = 0;
virtual void MountCompleted(MountEvent event_type,
MountError error_code,
const MountPointInfo& mount_info) = 0;
@@ -189,6 +198,7 @@ class MountLibrary {
// Helper functions for parameter conversions.
static std::string MountTypeToString(MountType type);
static MountType MountTypeFromString(const std::string& type_str);
+ static std::string MountConditionToString(MountCondition type);
// Used in testing. Enables mocking libcros.
virtual void SetLibcrosProxy(MountLibcrosProxy* proxy) {}
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chromeos/cros/mount_library.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698