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

Side by Side Diff: chrome/browser/chromeos/gdata/gdata_uploader.cc

Issue 10832331: Revert 151829 - Fix gdata includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
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 #include "chrome/browser/chromeos/gdata/gdata_uploader.h" 5 #include "chrome/browser/chromeos/gdata/gdata_uploader.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "chrome/browser/chromeos/gdata/gdata_directory_service.h" 11 #include "chrome/browser/chromeos/gdata/gdata_directory_service.h"
12 #include "chrome/browser/chromeos/gdata/gdata_documents_service.h" 12 #include "chrome/browser/chromeos/gdata/gdata_documents_service.h"
13 #include "chrome/browser/chromeos/gdata/gdata_upload_file_info.h" 13 #include "chrome/browser/chromeos/gdata/gdata_upload_file_info.h"
14 #include "chrome/browser/chromeos/gdata/gdata_wapi_parser.h"
15 #include "content/public/browser/browser_thread.h" 14 #include "content/public/browser/browser_thread.h"
16 #include "content/public/browser/download_item.h" 15 #include "content/public/browser/download_item.h"
17 #include "net/base/file_stream.h" 16 #include "net/base/file_stream.h"
18 #include "net/base/net_errors.h" 17 #include "net/base/net_errors.h"
19 18
20 using content::BrowserThread; 19 using content::BrowserThread;
21 20
22 namespace { 21 namespace {
23 22
24 // Google Documents List API requires uploading in chunks of 512kB. 23 // Google Documents List API requires uploading in chunks of 512kB.
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 if (!callback.is_null()) 452 if (!callback.is_null())
454 callback.Run(error, upload_file_info.Pass()); 453 callback.Run(error, upload_file_info.Pass());
455 } 454 }
456 455
457 void GDataUploader::RemoveUpload(int upload_id) { 456 void GDataUploader::RemoveUpload(int upload_id) {
458 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 457 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
459 pending_uploads_.erase(upload_id); 458 pending_uploads_.erase(upload_id);
460 } 459 }
461 460
462 } // namespace gdata 461 } // namespace gdata
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/gdata/gdata_protocol_handler.cc ('k') | chrome/browser/chromeos/gdata/gdata_wapi_feed_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698