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

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

Issue 10855243: child_files_ and child_directories_ have resource_ids instead of GDataFile* and GDataDirectory*. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: rebase Created 8 years, 4 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/chromeos/gdata/gdata_files.h
===================================================================
--- chrome/browser/chromeos/gdata/gdata_files.h (revision 152309)
+++ chrome/browser/chromeos/gdata/gdata_files.h (working copy)
@@ -252,15 +252,12 @@
// Takes over all entries from |dir|.
// TODO(satorux): Remove this. crbug.com/139649
- bool TakeOverEntries(GDataDirectory* dir);
+ void TakeOverEntries(GDataDirectory* dir);
- // Find a child by its name.
+ // Find a child's resource_id by its name.
satorux1 2012/08/20 16:40:08 Please document what's returned if the child is no
achuithb 2012/08/20 21:14:57 Done.
// TODO(satorux): Remove this. crbug.com/139649
- GDataEntry* FindChild(const FilePath::StringType& file_name) const;
+ const std::string& FindChild(const FilePath::StringType& file_name) const;
- // Add |entry| to children.
- void AddChild(GDataEntry* entry);
-
// Removes the entry from its children without destroying the
// entry instance.
void RemoveChild(GDataEntry* entry);
@@ -273,13 +270,11 @@
// Recursively extracts the paths set of all sub-directories.
void GetChildDirectoryPaths(std::set<FilePath>* child_dirs);
- // Maps between base_name and resource_id of files and directories.
- typedef std::map<FilePath::StringType, GDataFile*> GDataFileCollection;
- typedef std::map<FilePath::StringType, GDataDirectory*>
- GDataDirectoryCollection;
+ // Map between base_name and resource_id of files and directories.
+ typedef std::map<FilePath::StringType, std::string> GDataChildMap;
// Collection of children.
- GDataFileCollection child_files_;
- GDataDirectoryCollection child_directories_;
+ GDataChildMap child_files_;
+ GDataChildMap child_directories_;
DISALLOW_COPY_AND_ASSIGN(GDataDirectory);
};

Powered by Google App Engine
This is Rietveld 408576698