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

Unified Diff: ui/file_manager/file_manager/foreground/js/import_controller_unittest.html

Issue 792233009: Reflect scanning status in command UI. Only allow import once scanning is complete. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix FM.jstests.cc && Finalize scan results in MediaImportHandlerTest...unbreaking the test. Created 6 years 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 side-by-side diff with in-line comments
Download patch
Index: ui/file_manager/file_manager/foreground/js/import_controller_unittest.html
diff --git a/ui/file_manager/file_manager/background/js/media_import_handler_unittest.html b/ui/file_manager/file_manager/foreground/js/import_controller_unittest.html
similarity index 83%
copy from ui/file_manager/file_manager/background/js/media_import_handler_unittest.html
copy to ui/file_manager/file_manager/foreground/js/import_controller_unittest.html
index 79e1a194a7ee37d29337782f0f321372ea0e0de7..4cf860fe6ae8d99681dfe45a7b6bbc61eddd73c9 100644
--- a/ui/file_manager/file_manager/background/js/media_import_handler_unittest.html
+++ b/ui/file_manager/file_manager/foreground/js/import_controller_unittest.html
@@ -12,20 +12,19 @@
<script src="../../../../../ui/webui/resources/js/cr/ui/array_data_model.js"></script>
<script src="../../../../../ui/webui/resources/js/load_time_data.js"></script>
- <script src="../../background/js/mock_file_operation_manager.js"></script>
- <script src="../../background/js/mock_media_scanner.js"></script>
- <script src="../../background/js/mock_volume_manager.js"></script>
- <script src="../../common/js/importer_common.js"></script>
<script src="../../common/js/async_util.js"></script>
<script src="../../common/js/mock_entry.js"></script>
<script src="../../common/js/unittest_util.js"></script>
<script src="../../common/js/util.js"></script>
<script src="../../common/js/volume_manager_common.js"></script>
- <script src="task_queue.js"></script>
- <script src="media_import_handler.js"></script>
- <script src="volume_manager.js"></script>
- <script src="file_operation_util.js"></script>
+ <script src="../../common/js/importer_common.js"></script>
+
+ <script src="../../background/js/mock_file_operation_manager.js"></script>
+ <script src="../../background/js/mock_media_scanner.js"></script>
+ <script src="../../background/js/mock_volume_manager.js"></script>
+ <script src="../../background/js/volume_manager.js"></script>
- <script src="media_import_handler_unittest.js"></script>
+ <script src="import_controller.js"></script>
+ <script src="import_controller_unittest.js"></script>
</body>
</html>

Powered by Google App Engine
This is Rietveld 408576698