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

Unified Diff: chrome/browser/extensions/extension_file_browser_private_api.cc

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
Index: chrome/browser/extensions/extension_file_browser_private_api.cc
diff --git a/chrome/browser/extensions/extension_file_browser_private_api.cc b/chrome/browser/extensions/extension_file_browser_private_api.cc
index 0a6be002ea148188812202e25a7272ac61cef940..2cd65da083177b01e0b0484afcc2b369ffd44fc7 100644
--- a/chrome/browser/extensions/extension_file_browser_private_api.cc
+++ b/chrome/browser/extensions/extension_file_browser_private_api.cc
@@ -268,6 +268,10 @@ base::DictionaryValue* MountPointToValue(Profile* profile,
mount_info->SetString("mountPath", relative_mount_path.value());
}
+ mount_info->SetString("mountCondition",
+ chromeos::MountLibrary::MountConditionToString(
+ mount_point_info.mount_condition));
+
return mount_info;
}
#endif
@@ -1346,12 +1350,15 @@ bool GetVolumeMetadataFunction::RunImpl() {
DictionaryValue* volume_info = new DictionaryValue();
result_.reset(volume_info);
// Localising mount path.
- FilePath relative_mount_path;
- FileManagerUtil::ConvertFileToRelativeFileSystemPath(profile_,
- FilePath(volume->mount_path()), &relative_mount_path);
-
+ std::string mount_path;
+ if (!volume->mount_path().empty()) {
+ FilePath relative_mount_path;
+ FileManagerUtil::ConvertFileToRelativeFileSystemPath(profile_,
+ FilePath(volume->mount_path()), &relative_mount_path);
+ mount_path = relative_mount_path.value();
+ }
volume_info->SetString("devicePath", volume->device_path());
- volume_info->SetString("mountPath", relative_mount_path.value());
+ volume_info->SetString("mountPath", mount_path);
volume_info->SetString("systemPath", volume->system_path());
volume_info->SetString("filePath", volume->file_path());
volume_info->SetString("deviceLabel", volume->device_label());
@@ -1477,6 +1484,8 @@ bool FileDialogStringsFunction::RunImpl() {
SET_STRING(IDS_FILE_BROWSER, CONFIRM_DELETE_ONE);
SET_STRING(IDS_FILE_BROWSER, CONFIRM_DELETE_SOME);
+ SET_STRING(IDS_FILE_BROWSER, UNKNOWN_FILESYSTEM_WARNING);
+ SET_STRING(IDS_FILE_BROWSER, UNSUPPORTED_FILESYSTEM_WARNING);
SET_STRING(IDS_FILE_BROWSER, FORMATTING_WARNING);
SET_STRING(IDS_FILE_BROWSER, SELECT_FOLDER_TITLE);

Powered by Google App Engine
This is Rietveld 408576698