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

Unified Diff: service.cc

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
« service.h ('K') | « service.h ('k') | vault_keyset.proto » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: service.cc
diff --git a/service.cc b/service.cc
index 7a46129651a1f832a843f8243c330aff1bd2dc91..a7b17ed448101374d5bb9609cbc45744ca6b34f3 100644
--- a/service.cc
+++ b/service.cc
@@ -333,8 +333,8 @@ gboolean Service::IsMounted(gboolean *OUT_is_mounted, GError **error) {
gboolean Service::Mount(gchar *userid,
gchar *key,
gboolean create_if_missing,
- gboolean replace_tracked_subdirectories,
- gchar** tracked_subdirectories,
+ gboolean deprecated_replace_tracked_subdirectories,
+ gchar** deprecated_tracked_subdirectories,
gint *OUT_error_code,
gboolean *OUT_result,
GError **error) {
@@ -360,11 +360,6 @@ gboolean Service::Mount(gchar *userid,
base::WaitableEvent event(true, false);
Mount::MountArgs mount_args;
mount_args.create_if_missing = create_if_missing;
- mount_args.replace_tracked_subdirectories = replace_tracked_subdirectories;
- if (tracked_subdirectories) {
- mount_args.AssignSubdirsNullTerminatedList(
- const_cast<const char**>(tracked_subdirectories));
- }
MountTaskMount* mount_task = new MountTaskMount(NULL,
mount_,
credentials,
@@ -381,8 +376,8 @@ gboolean Service::Mount(gchar *userid,
gboolean Service::AsyncMount(gchar *userid,
gchar *key,
gboolean create_if_missing,
- gboolean replace_tracked_subdirectories,
- gchar** tracked_subdirectories,
+ gboolean deprecated_replace_tracked_subdirectories,
+ gchar** deprecated_tracked_subdirectories,
gint *OUT_async_id,
GError **error) {
UsernamePasskey credentials(userid, SecureBlob(key, strlen(key)));
@@ -412,11 +407,6 @@ gboolean Service::AsyncMount(gchar *userid,
Mount::MountArgs mount_args;
mount_args.create_if_missing = create_if_missing;
- mount_args.replace_tracked_subdirectories = replace_tracked_subdirectories;
- if (tracked_subdirectories) {
- mount_args.AssignSubdirsNullTerminatedList(
- const_cast<const char**>(tracked_subdirectories));
- }
MountTaskMount* mount_task = new MountTaskMount(this,
mount_,
credentials,
« service.h ('K') | « service.h ('k') | vault_keyset.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698