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/extensions/file_browser_private_api.h" | 5 #include "chrome/browser/chromeos/extensions/file_browser_private_api.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/base64.h" | 9 #include "base/base64.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 1355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1366 SET_STRING(IDS_FILE_BROWSER, DOWNLOADS_DIRECTORY_WARNING); | 1366 SET_STRING(IDS_FILE_BROWSER, DOWNLOADS_DIRECTORY_WARNING); |
1367 | 1367 |
1368 SET_STRING(IDS_FILE_BROWSER, ERROR_CREATING_FOLDER); | 1368 SET_STRING(IDS_FILE_BROWSER, ERROR_CREATING_FOLDER); |
1369 SET_STRING(IDS_FILE_BROWSER, ERROR_INVALID_CHARACTER); | 1369 SET_STRING(IDS_FILE_BROWSER, ERROR_INVALID_CHARACTER); |
1370 SET_STRING(IDS_FILE_BROWSER, ERROR_RESERVED_NAME); | 1370 SET_STRING(IDS_FILE_BROWSER, ERROR_RESERVED_NAME); |
1371 SET_STRING(IDS_FILE_BROWSER, ERROR_HIDDEN_NAME); | 1371 SET_STRING(IDS_FILE_BROWSER, ERROR_HIDDEN_NAME); |
1372 SET_STRING(IDS_FILE_BROWSER, ERROR_WHITESPACE_NAME); | 1372 SET_STRING(IDS_FILE_BROWSER, ERROR_WHITESPACE_NAME); |
1373 SET_STRING(IDS_FILE_BROWSER, ERROR_NEW_FOLDER_EMPTY_NAME); | 1373 SET_STRING(IDS_FILE_BROWSER, ERROR_NEW_FOLDER_EMPTY_NAME); |
1374 SET_STRING(IDS_FILE_BROWSER, NEW_FOLDER_BUTTON_LABEL); | 1374 SET_STRING(IDS_FILE_BROWSER, NEW_FOLDER_BUTTON_LABEL); |
1375 SET_STRING(IDS_FILE_BROWSER, FILENAME_LABEL); | 1375 SET_STRING(IDS_FILE_BROWSER, FILENAME_LABEL); |
1376 SET_STRING(IDS_FILE_BROWSER, PREPARING_LABEL); | |
1376 | 1377 |
1377 SET_STRING(IDS_FILE_BROWSER, DIMENSIONS_LABEL); | 1378 SET_STRING(IDS_FILE_BROWSER, DIMENSIONS_LABEL); |
1378 SET_STRING(IDS_FILE_BROWSER, DIMENSIONS_FORMAT); | 1379 SET_STRING(IDS_FILE_BROWSER, DIMENSIONS_FORMAT); |
1379 | 1380 |
1380 SET_STRING(IDS_FILE_BROWSER, IMAGE_DIMENSIONS); | 1381 SET_STRING(IDS_FILE_BROWSER, IMAGE_DIMENSIONS); |
1381 SET_STRING(IDS_FILE_BROWSER, VOLUME_LABEL); | 1382 SET_STRING(IDS_FILE_BROWSER, VOLUME_LABEL); |
1382 SET_STRING(IDS_FILE_BROWSER, READ_ONLY); | 1383 SET_STRING(IDS_FILE_BROWSER, READ_ONLY); |
1383 | 1384 |
1384 SET_STRING(IDS_FILE_BROWSER, ARCHIVE_MOUNT_FAILED); | 1385 SET_STRING(IDS_FILE_BROWSER, ARCHIVE_MOUNT_FAILED); |
1385 SET_STRING(IDS_FILE_BROWSER, UNMOUNT_FAILED); | 1386 SET_STRING(IDS_FILE_BROWSER, UNMOUNT_FAILED); |
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1831 } | 1832 } |
1832 | 1833 |
1833 scoped_ptr<ListValue> responses(new ListValue()); | 1834 scoped_ptr<ListValue> responses(new ListValue()); |
1834 for (size_t i = 0; i < files.size(); ++i) { | 1835 for (size_t i = 0; i < files.size(); ++i) { |
1835 DCHECK(gdata::util::IsUnderGDataMountPoint(files[i].path)); | 1836 DCHECK(gdata::util::IsUnderGDataMountPoint(files[i].path)); |
1836 FilePath file_path = gdata::util::ExtractGDataPath(files[i].path); | 1837 FilePath file_path = gdata::util::ExtractGDataPath(files[i].path); |
1837 scoped_ptr<DictionaryValue> result(new DictionaryValue()); | 1838 scoped_ptr<DictionaryValue> result(new DictionaryValue()); |
1838 result->SetBoolean("canceled", file_system->CancelOperation(file_path)); | 1839 result->SetBoolean("canceled", file_system->CancelOperation(file_path)); |
1839 GURL file_url; | 1840 GURL file_url; |
1840 if (file_manager_util::ConvertFileToFileSystemUrl(profile_, | 1841 if (file_manager_util::ConvertFileToFileSystemUrl(profile_, |
1841 FilePath("gdata").Append(file_path), | 1842 FilePath("/special/gdata").Append(file_path), |
zel
2012/03/22 17:21:46
THis does not look right. Why do you need /special
dgozman
2012/03/23 12:44:05
This is no different from ProgessStatusToDictionar
| |
1842 source_url_.GetOrigin(), | 1843 source_url_.GetOrigin(), |
1843 &file_url)) { | 1844 &file_url)) { |
1844 result->SetString("fileUrl", file_url.spec()); | 1845 result->SetString("fileUrl", file_url.spec()); |
1845 } | 1846 } |
1846 | 1847 |
1847 responses->Append(result.release()); | 1848 responses->Append(result.release()); |
1848 } | 1849 } |
1849 result_.reset(responses.release()); | 1850 result_.reset(responses.release()); |
1850 SendResponse(true); | 1851 SendResponse(true); |
1851 } | 1852 } |
OLD | NEW |