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

Unified Diff: chrome/browser/sync_file_system/drive_metadata_store.h

Issue 12744008: SyncFS: store disabled origins in DriveMetadataStore (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: unit tests and review fix Created 7 years, 9 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/sync_file_system/drive_metadata_store.h
diff --git a/chrome/browser/sync_file_system/drive_metadata_store.h b/chrome/browser/sync_file_system/drive_metadata_store.h
index 691514bb0f635c97a00cf16002ed2cdda137f88c..c235a1f1a4b6602b284b2c2942443309556945c4 100644
--- a/chrome/browser/sync_file_system/drive_metadata_store.h
+++ b/chrome/browser/sync_file_system/drive_metadata_store.h
@@ -80,6 +80,9 @@ class DriveMetadataStore
// incrementally.
bool IsIncrementalSyncOrigin(const GURL& origin) const;
+ // Returns true if |origin| is a disabled sync origin.
+ bool IsDisabledSyncOrigin(const GURL& origin) const;
+
// Marks |origin| as a batch sync origin and associates it with the directory
// identified by |resource_id|.
// |origin| must not be a batch sync origin nor an incremental sync origin.
@@ -89,6 +92,12 @@ class DriveMetadataStore
// |origin| must be a batch sync origin.
void MoveBatchSyncOriginToIncremental(const GURL& origin);
+ void EnableOriginSync(const GURL& origin,
+ const SyncStatusCallback& callback);
+
+ void DisableOriginSync(const GURL& origin,
+ const SyncStatusCallback& callback);
+
void RemoveOrigin(const GURL& origin,
const SyncStatusCallback& callback);
@@ -126,9 +135,17 @@ class DriveMetadataStore
return incremental_sync_origins_;
}
- // Returns all origins that are tracked. i.e. Union of batch_sync_origins_ and
+ const ResourceIDMap& disabled_sync_origins() const {
+ DCHECK(CalledOnValidThread());
+ return disabled_sync_origins_;
+ }
+
+ // Returns tracked and enabled origins. i.e. Union of batch_sync_origins_ and
// incremental_sync_origins_.
- void GetAllOrigins(std::vector<GURL>* origins);
+ void GetEnabledOrigins(std::vector<GURL>* origins);
+
+ // Returns tracked but disabled origins. i.e. disabled_origins_.
+ void GetDisabledOrigins(std::vector<GURL>* origins);
private:
friend class DriveMetadataStoreTest;
@@ -139,7 +156,7 @@ class DriveMetadataStore
void DidInitialize(const InitializationCallback& callback,
DriveMetadataDBContents* contents,
SyncStatusCode error);
- void DidRemoveOrigin(const SyncStatusCallback& callback,
+ void DidChangeOrigin(const SyncStatusCallback& callback,
SyncStatusCode status);
// These are only for testing.
@@ -151,6 +168,7 @@ class DriveMetadataStore
void DidRestoreSyncOrigins(const SyncStatusCallback& callback,
ResourceIDMap* batch_sync_origins,
ResourceIDMap* incremental_sync_origins,
+ ResourceIDMap* disabled_sync_origins,
SyncStatusCode status);
scoped_refptr<base::SequencedTaskRunner> file_task_runner_;
@@ -163,6 +181,7 @@ class DriveMetadataStore
std::string sync_root_directory_resource_id_;
ResourceIDMap batch_sync_origins_;
ResourceIDMap incremental_sync_origins_;
+ ResourceIDMap disabled_sync_origins_;
DISALLOW_COPY_AND_ASSIGN(DriveMetadataStore);
};

Powered by Google App Engine
This is Rietveld 408576698