| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/media_galleries/fileapi/picasa_finder.h" | 5 #include "chrome/browser/media_galleries/fileapi/picasa_finder.h" |
| 6 | 6 |
| 7 #include "base/base_paths.h" | 7 #include "base/base_paths.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 // Verify actual existence | 40 // Verify actual existence |
| 41 if (!base::DirectoryExists(path)) | 41 if (!base::DirectoryExists(path)) |
| 42 path.clear(); | 42 path.clear(); |
| 43 | 43 |
| 44 return path; | 44 return path; |
| 45 } | 45 } |
| 46 | 46 |
| 47 void FinishOnOriginalThread(const PicasaFinder::DeviceIDCallback& callback, | 47 void FinishOnOriginalThread(const PicasaFinder::DeviceIDCallback& callback, |
| 48 const base::FilePath& database_path) { | 48 const base::FilePath& database_path) { |
| 49 if (!database_path.empty()) | 49 if (!database_path.empty()) |
| 50 callback.Run(chrome::StorageInfo::MakeDeviceId( | 50 callback.Run(StorageInfo::MakeDeviceId(StorageInfo::PICASA, |
| 51 chrome::StorageInfo::PICASA, | 51 database_path.AsUTF8Unsafe())); |
| 52 database_path.AsUTF8Unsafe())); | |
| 53 } | 52 } |
| 54 | 53 |
| 55 } // namespace | 54 } // namespace |
| 56 | 55 |
| 57 void PicasaFinder::FindPicasaDatabase( | 56 void PicasaFinder::FindPicasaDatabase( |
| 58 const PicasaFinder::DeviceIDCallback& callback) { | 57 const PicasaFinder::DeviceIDCallback& callback) { |
| 59 content::BrowserThread::PostTaskAndReplyWithResult( | 58 content::BrowserThread::PostTaskAndReplyWithResult( |
| 60 content::BrowserThread::FILE, | 59 content::BrowserThread::FILE, |
| 61 FROM_HERE, | 60 FROM_HERE, |
| 62 base::Bind(&FindPicasaDatabaseOnFileThread), | 61 base::Bind(&FindPicasaDatabaseOnFileThread), |
| 63 base::Bind(&FinishOnOriginalThread, callback)); | 62 base::Bind(&FinishOnOriginalThread, callback)); |
| 64 } | 63 } |
| 65 | 64 |
| 66 } // namespace picasa | 65 } // namespace picasa |
| OLD | NEW |