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

Side by Side Diff: chrome/browser/chromeos/file_manager/volume_manager.h

Issue 673253005: Revert of Add a has_media flag to VolumeMetadata. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_H_
6 #define CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_H_ 6 #define CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 // Label for the volume if the volume is either removable or a provided 100 // Label for the volume if the volume is either removable or a provided
101 // file system. In case of removables, if disk is a parent, then its label, 101 // file system. In case of removables, if disk is a parent, then its label,
102 // else parents label (e.g. "TransMemory"). 102 // else parents label (e.g. "TransMemory").
103 std::string volume_label; 103 std::string volume_label;
104 104
105 // Is the device is a parent device (i.e. sdb rather than sdb1). 105 // Is the device is a parent device (i.e. sdb rather than sdb1).
106 bool is_parent; 106 bool is_parent;
107 107
108 // True if the volume is read only. 108 // True if the volume is read only.
109 bool is_read_only; 109 bool is_read_only;
110
111 // True if the volume contains media.
112 bool has_media;
113 }; 110 };
114 111
115 // Manages "Volume"s for file manager. Here are "Volume"s. 112 // Manages "Volume"s for file manager. Here are "Volume"s.
116 // - Drive File System (not yet supported). 113 // - Drive File System (not yet supported).
117 // - Downloads directory. 114 // - Downloads directory.
118 // - Removable disks (volume will be created for each partition, not only one 115 // - Removable disks (volume will be created for each partition, not only one
119 // for a device). 116 // for a device).
120 // - Mounted zip archives. 117 // - Mounted zip archives.
121 class VolumeManager : public KeyedService, 118 class VolumeManager : public KeyedService,
122 public drive::DriveIntegrationServiceObserver, 119 public drive::DriveIntegrationServiceObserver,
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 224
228 // Note: This should remain the last member so it'll be destroyed and 225 // Note: This should remain the last member so it'll be destroyed and
229 // invalidate its weak pointers before any other members are destroyed. 226 // invalidate its weak pointers before any other members are destroyed.
230 base::WeakPtrFactory<VolumeManager> weak_ptr_factory_; 227 base::WeakPtrFactory<VolumeManager> weak_ptr_factory_;
231 DISALLOW_COPY_AND_ASSIGN(VolumeManager); 228 DISALLOW_COPY_AND_ASSIGN(VolumeManager);
232 }; 229 };
233 230
234 } // namespace file_manager 231 } // namespace file_manager
235 232
236 #endif // CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_H_ 233 #endif // CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698