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

Unified Diff: mount.h

Issue 6598009: Deprecating tracked_directories as a Vault parameter (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/cryptohome.git@master
Patch Set: Created 9 years, 10 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 | « make_tests.cc ('k') | mount.cc » ('j') | service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mount.h
diff --git a/mount.h b/mount.h
index e63ff877e29cb059e41a481933624db3fa73e697..294834097a4f392186d3c44c11cb6a32f323f245 100644
--- a/mount.h
+++ b/mount.h
@@ -59,30 +59,12 @@ class Mount : public EntropySource {
struct MountArgs {
bool create_if_missing;
- bool replace_tracked_subdirectories;
- std::vector<std::string> tracked_subdirectories;
- MountArgs()
- : create_if_missing(false),
- replace_tracked_subdirectories(false) {
- }
-
- void AssignSubdirsNullTerminatedList(const char** tracked_subdirectories) {
- while (*tracked_subdirectories != NULL) {
- this->tracked_subdirectories.push_back(*tracked_subdirectories);
- tracked_subdirectories++;
- }
+ MountArgs() : create_if_missing(false) {
}
void CopyFrom(const MountArgs& rhs) {
this->create_if_missing = rhs.create_if_missing;
- this->replace_tracked_subdirectories = rhs.replace_tracked_subdirectories;
- for (std::vector<std::string>::const_iterator itr =
- rhs.tracked_subdirectories.begin();
- itr != rhs.tracked_subdirectories.end();
- itr++) {
- this->tracked_subdirectories.push_back(*itr);
- }
}
};
@@ -159,14 +141,6 @@ class Mount : public EntropySource {
virtual bool CreateTrackedSubdirectories(const Credentials& credentials,
bool is_new) const;
- // Replaces the tracked subdirectories, returning true if a substition was
- // made, or false if the set was the same
- //
- // Parameters
- virtual bool ReplaceTrackedSubdirectories(
- const std::vector<std::string>& tracked_subdirectories,
- SerializedVaultKeyset* serialized) const;
-
// Cleans (removes) content from unmounted tracked subdirectories
virtual void CleanUnmountedTrackedSubdirectories() const;
« no previous file with comments | « make_tests.cc ('k') | mount.cc » ('j') | service.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698