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

Unified Diff: chrome/browser/chromeos/gdata/gdata_operation_registry.cc

Issue 10285002: Revert 134774 because of win aura compile and chromium os browser_test crashes - Created uber tray … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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_operation_registry.cc
===================================================================
--- chrome/browser/chromeos/gdata/gdata_operation_registry.cc (revision 134777)
+++ chrome/browser/chromeos/gdata/gdata_operation_registry.cc (working copy)
@@ -272,11 +272,11 @@
return type == OPERATION_UPLOAD || type == OPERATION_DOWNLOAD;
}
-GDataOperationRegistry::ProgressStatusList
+std::vector<GDataOperationRegistry::ProgressStatus>
GDataOperationRegistry::GetProgressStatusList() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- ProgressStatusList status_list;
+ std::vector<ProgressStatus> status_list;
for (OperationIDMap::const_iterator iter(&in_flight_operations_);
!iter.IsAtEnd();
iter.Advance()) {
« no previous file with comments | « chrome/browser/chromeos/gdata/gdata_operation_registry.h ('k') | chrome/browser/chromeos/gdata/gdata_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698