| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 // Browser test for basic Chrome OS file manager functionality: | 5 // Browser test for basic Chrome OS file manager functionality: |
| 6 // - The file list is updated when a file is added externally to the Downloads | 6 // - The file list is updated when a file is added externally to the Downloads |
| 7 // folder. | 7 // folder. |
| 8 // - Selecting a file and copy-pasting it with the keyboard copies the file. | 8 // - Selecting a file and copy-pasting it with the keyboard copies the file. |
| 9 // - Selecting a file and pressing delete deletes it. | 9 // - Selecting a file and pressing delete deletes it. |
| 10 | 10 |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 static void RegisterJSONConverter( | 138 static void RegisterJSONConverter( |
| 139 base::JSONValueConverter<TestEntryInfo>* converter); | 139 base::JSONValueConverter<TestEntryInfo>* converter); |
| 140 }; | 140 }; |
| 141 | 141 |
| 142 // static | 142 // static |
| 143 void TestEntryInfo::RegisterJSONConverter( | 143 void TestEntryInfo::RegisterJSONConverter( |
| 144 base::JSONValueConverter<TestEntryInfo>* converter) { | 144 base::JSONValueConverter<TestEntryInfo>* converter) { |
| 145 converter->RegisterCustomField("type", | 145 converter->RegisterCustomField("type", |
| 146 &TestEntryInfo::type, | 146 &TestEntryInfo::type, |
| 147 &MapStringToEntryType); | 147 &MapStringToEntryType); |
| 148 converter->RegisterStringField("source_file_name", | 148 converter->RegisterStringField("sourceFileName", |
| 149 &TestEntryInfo::source_file_name); | 149 &TestEntryInfo::source_file_name); |
| 150 converter->RegisterStringField("target_name", &TestEntryInfo::target_name); | 150 converter->RegisterStringField("targetName", &TestEntryInfo::target_name); |
| 151 converter->RegisterStringField("mime_type", &TestEntryInfo::mime_type); | 151 converter->RegisterStringField("mimeType", &TestEntryInfo::mime_type); |
| 152 converter->RegisterCustomField("shared_option", | 152 converter->RegisterCustomField("sharedOption", |
| 153 &TestEntryInfo::shared_option, | 153 &TestEntryInfo::shared_option, |
| 154 &MapStringToSharedOption); | 154 &MapStringToSharedOption); |
| 155 converter->RegisterCustomField("last_modified_time", | 155 converter->RegisterCustomField("lastModifiedTime", |
| 156 &TestEntryInfo::last_modified_time, | 156 &TestEntryInfo::last_modified_time, |
| 157 &MapStringToTime); | 157 &MapStringToTime); |
| 158 } | 158 } |
| 159 | 159 |
| 160 // Message from JavaScript to add entries. | 160 // Message from JavaScript to add entries. |
| 161 struct AddEntriesMessage { | 161 struct AddEntriesMessage { |
| 162 // Target volume to be added the |entries|. | 162 // Target volume to be added the |entries|. |
| 163 TargetVolume volume; | 163 TargetVolume volume; |
| 164 | 164 |
| 165 // Entries to be added. | 165 // Entries to be added. |
| (...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 694 TestParameter(NOT_IN_GUEST_MODE, "shareDirectory"))); | 694 TestParameter(NOT_IN_GUEST_MODE, "shareDirectory"))); |
| 695 | 695 |
| 696 INSTANTIATE_TEST_CASE_P( | 696 INSTANTIATE_TEST_CASE_P( |
| 697 restoreGeometry, | 697 restoreGeometry, |
| 698 FileManagerBrowserTest, | 698 FileManagerBrowserTest, |
| 699 ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "restoreGeometry"), | 699 ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "restoreGeometry"), |
| 700 TestParameter(IN_GUEST_MODE, "restoreGeometry"))); | 700 TestParameter(IN_GUEST_MODE, "restoreGeometry"))); |
| 701 | 701 |
| 702 } // namespace | 702 } // namespace |
| 703 } // namespace file_manager | 703 } // namespace file_manager |
| OLD | NEW |