| OLD | NEW |
| 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_documents_service.h" | 12 #include "chrome/browser/chromeos/gdata/gdata_documents_service.h" |
| 12 #include "chrome/browser/chromeos/gdata/gdata_files.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 "content/public/browser/browser_thread.h" | 14 #include "content/public/browser/browser_thread.h" |
| 15 #include "content/public/browser/download_item.h" | 15 #include "content/public/browser/download_item.h" |
| 16 #include "net/base/file_stream.h" | 16 #include "net/base/file_stream.h" |
| 17 #include "net/base/net_errors.h" | 17 #include "net/base/net_errors.h" |
| 18 | 18 |
| 19 using content::BrowserThread; | 19 using content::BrowserThread; |
| 20 | 20 |
| 21 namespace { | 21 namespace { |
| 22 | 22 |
| (...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 452 if (!callback.is_null()) | 452 if (!callback.is_null()) |
| 453 callback.Run(error, upload_file_info.Pass()); | 453 callback.Run(error, upload_file_info.Pass()); |
| 454 } | 454 } |
| 455 | 455 |
| 456 void GDataUploader::RemoveUpload(int upload_id) { | 456 void GDataUploader::RemoveUpload(int upload_id) { |
| 457 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 457 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 458 pending_uploads_.erase(upload_id); | 458 pending_uploads_.erase(upload_id); |
| 459 } | 459 } |
| 460 | 460 |
| 461 } // namespace gdata | 461 } // namespace gdata |
| OLD | NEW |