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

Unified Diff: chrome/browser/chromeos/file_manager/volume_manager.cc

Issue 309483008: Files.app: Retrieve disk label name from mount path. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test Created 6 years, 7 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 | « no previous file | chrome/test/data/extensions/api_test/file_browser/mount_test/test.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/file_manager/volume_manager.cc
diff --git a/chrome/browser/chromeos/file_manager/volume_manager.cc b/chrome/browser/chromeos/file_manager/volume_manager.cc
index 829e1972283e30bf8a884b25c07d34ddb24747c5..c802e9027c4506a1c1345fbac3ba0c31888cb93d 100644
--- a/chrome/browser/chromeos/file_manager/volume_manager.cc
+++ b/chrome/browser/chromeos/file_manager/volume_manager.cc
@@ -183,11 +183,11 @@ VolumeInfo CreateVolumeInfoFromMountPointInfo(
volume_info.source_path = base::FilePath(mount_point.source_path);
volume_info.mount_path = base::FilePath(mount_point.mount_path);
volume_info.mount_condition = mount_point.mount_condition;
+ volume_info.volume_label = volume_info.mount_path.BaseName().AsUTF8Unsafe();
if (disk) {
volume_info.device_type = disk->device_type();
volume_info.system_path_prefix =
base::FilePath(disk->system_path_prefix());
- volume_info.volume_label = disk->drive_label();
volume_info.is_parent = disk->is_parent();
volume_info.is_read_only = disk->is_read_only();
} else {
« no previous file with comments | « no previous file | chrome/test/data/extensions/api_test/file_browser/mount_test/test.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698