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

Side by Side Diff: chrome/browser/chromeos/drive/drive_files.h

Issue 12769002: chromeos: Merge DriveDirectory::child_fils_ and child_directories_ into one variable, children_ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: _ 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/chromeos/drive/drive_files.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILES_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILES_H_
6 #define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILES_H_ 6 #define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILES_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 void RemoveChildren(); 152 void RemoveChildren();
153 void RemoveChildFiles(); 153 void RemoveChildFiles();
154 void RemoveChildDirectories(); 154 void RemoveChildDirectories();
155 155
156 // Recursively extracts the paths set of all sub-directories. 156 // Recursively extracts the paths set of all sub-directories.
157 void GetChildDirectoryPaths(std::set<base::FilePath>* child_dirs); 157 void GetChildDirectoryPaths(std::set<base::FilePath>* child_dirs);
158 158
159 // Map between base_name and resource_id of files and directories. 159 // Map between base_name and resource_id of files and directories.
160 typedef std::map<base::FilePath::StringType, std::string> ChildMap; 160 typedef std::map<base::FilePath::StringType, std::string> ChildMap;
161 // Collection of children. 161 // Collection of children.
162 ChildMap child_files_; 162 ChildMap children_;
163 ChildMap child_directories_;
164 163
165 DISALLOW_COPY_AND_ASSIGN(DriveDirectory); 164 DISALLOW_COPY_AND_ASSIGN(DriveDirectory);
166 }; 165 };
167 166
168 } // namespace drive 167 } // namespace drive
169 168
170 #endif // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILES_H_ 169 #endif // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILES_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/drive/drive_files.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698