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

Unified Diff: chrome/browser/chromeos/gdata/gdata_file_system.h

Issue 10825120: gdata: Introduce GDataWapiFeedProcessor class (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments Created 8 years, 5 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/browser/chromeos/gdata/gdata_file_system.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/gdata/gdata_file_system.h
diff --git a/chrome/browser/chromeos/gdata/gdata_file_system.h b/chrome/browser/chromeos/gdata/gdata_file_system.h
index ce00299b5b8c551db648c67f63a47b3aabd7500a..705dacc290db531b8765b3c1cc2e81633f9cb1c0 100644
--- a/chrome/browser/chromeos/gdata/gdata_file_system.h
+++ b/chrome/browser/chromeos/gdata/gdata_file_system.h
@@ -38,6 +38,10 @@ namespace {
struct LoadRootFeedParams;
} // namespace
+// TODO(satorux): Move this into a new file. crbug.com/130669
+typedef std::map<std::string /* resource_id */, GDataEntry*>
+ FileResourceIdMap;
+
// The production implementation of GDataFileSystemInterface.
class GDataFileSystem : public GDataFileSystemInterface,
public content::NotificationObserver {
@@ -156,9 +160,6 @@ class GDataFileSystem : public GDataFileSystemInterface,
// execution of GetFileByPath() method.
struct GetFileFromCacheParams;
- typedef std::map<std::string /* resource_id */, GDataEntry*>
- FileResourceIdMap;
-
// Callback similar to FileOperationCallback but with a given |file_path|.
typedef base::Callback<void(GDataFileError error,
const FilePath& file_path)>
@@ -169,9 +170,6 @@ class GDataFileSystem : public GDataFileSystemInterface,
GDataFileError error)>
LoadDocumentFeedCallback;
- // Struct used to record UMA stats with FeedToFileResourceMap().
- struct FeedToFileResourceMapUmaStats;
-
// Struct used for StartFileUploadOnUIThread().
struct StartFileUploadParams;
@@ -524,60 +522,12 @@ class GDataFileSystem : public GDataFileSystemInterface,
int largest_changestamp,
int root_feed_changestamp);
- // Updates UMA histograms about file counts.
- void UpdateFileCountUmaHistograms(
- const FeedToFileResourceMapUmaStats& uma_stats) const;
-
- // Applies the pre-processed feed from |file_map| map onto the file system.
- // All entries in |file_map| will be erased (i.e. the map becomes empty),
- // and values are deleted.
- void ApplyFeedFromFileUrlMap(bool is_delta_feed,
- int feed_changestamp,
- FileResourceIdMap* file_map);
-
- // Helper function for adding new |file| from the feed into |directory|. It
- // checks the type of file and updates |changed_dirs| if this file adding
- // operation needs to raise directory notification update. If file is being
- // added to |orphaned_dir_service| such notifications are not raised since
- // we ignore such files and don't add them to the file system now.
- // static
- static void AddEntryToDirectoryAndCollectChangedDirectories(
- GDataEntry* entry,
- GDataDirectory* directory,
- GDataDirectoryService* orphaned_dir_service,
- std::set<FilePath>* changed_dirs);
-
- // Helper function for removing |entry| from |directory|. If |entry| is a
- // directory too, it will collect all its children file paths into
- // |changed_dirs| as well.
- // static
- static void RemoveEntryFromDirectoryAndCollectChangedDirectories(
- GDataDirectory* directory,
- GDataEntry* entry,
- std::set<FilePath>* changed_dirs);
-
// Callback for GetEntryByResourceIdAsync.
// Removes stale entry upon upload of file.
static void RemoveStaleEntryOnUpload(const std::string& resource_id,
GDataDirectory* parent_dir,
GDataEntry* existing_entry);
- // Finds directory where new |file| should be added to during feed processing.
- // |orphaned_entries_dir| collects files/dirs that don't have a parent in
- // either locally cached file system or in this new feed.
- GDataDirectory* FindDirectoryForNewEntry(
- GDataEntry* new_entry,
- const FileResourceIdMap& file_map,
- GDataDirectoryService* orphaned_entries);
-
- // Converts list of document feeds from collected feeds into
- // FileResourceIdMap.
- GDataFileError FeedToFileResourceMap(
- const std::vector<DocumentFeed*>& feed_list,
- FileResourceIdMap* file_map,
- int* feed_changestamp,
- FeedToFileResourceMapUmaStats* uma_stats);
-
// Converts |entry_value| into GFileDocument instance and adds it
// to virtual file system at |directory_path|.
GDataFileError AddNewDirectory(const FilePath& directory_path,
« no previous file with comments | « no previous file | chrome/browser/chromeos/gdata/gdata_file_system.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698