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

Side by Side Diff: ui/file_manager/file_manager_resources.grd

Issue 881463003: Files.app: Add a deduplication step to avoid importing duplicate media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync to master; fix Banners test. Created 5 years, 10 months 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 unified diff | Download patch
« no previous file with comments | « ui/file_manager/file_manager/manifest.json ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <grit latest_public_release="0" current_release="1"> 2 <grit latest_public_release="0" current_release="1">
3 <outputs> 3 <outputs>
4 <output filename="grit/file_manager_resources.h" type="rc_header"> 4 <output filename="grit/file_manager_resources.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="grit/file_manager_resources_map.cc" type="resource_file_ma p_source" /> 7 <output filename="grit/file_manager_resources_map.cc" type="resource_file_ma p_source" />
8 <output filename="grit/file_manager_resources_map.h" type="resource_map_head er" /> 8 <output filename="grit/file_manager_resources_map.h" type="resource_map_head er" />
9 <output filename="file_manager_resources.pak" type="data_package" /> 9 <output filename="file_manager_resources.pak" type="data_package" />
10 <output filename="file_manager_resources.rc" type="rc_all" /> 10 <output filename="file_manager_resources.rc" type="rc_all" />
(...skipping 12 matching lines...) Expand all
23 <include name="IDR_FILE_MANAGER_PROGRESS_CENTER_COMMON_JS" file="file_mana ger/common/js/progress_center_common.js" flattenhtml="false" type="BINDATA" /> 23 <include name="IDR_FILE_MANAGER_PROGRESS_CENTER_COMMON_JS" file="file_mana ger/common/js/progress_center_common.js" flattenhtml="false" type="BINDATA" />
24 <include name="IDR_FILE_MANAGER_UTIL_JS" file="file_manager/common/js/util .js" flattenhtml="false" type="BINDATA" /> 24 <include name="IDR_FILE_MANAGER_UTIL_JS" file="file_manager/common/js/util .js" flattenhtml="false" type="BINDATA" />
25 <include name="IDR_FILE_MANAGER_VOLUME_MANAGER_COMMON_JS" file="file_manag er/common/js/volume_manager_common.js" flattenhtml="false" type="BINDATA" /> 25 <include name="IDR_FILE_MANAGER_VOLUME_MANAGER_COMMON_JS" file="file_manag er/common/js/volume_manager_common.js" flattenhtml="false" type="BINDATA" />
26 <include name="IDR_FILE_MANAGER_IMPORTER_COMMON_JS" file="file_manager/com mon/js/importer_common.js" flattenhtml="false" type="BINDATA" /> 26 <include name="IDR_FILE_MANAGER_IMPORTER_COMMON_JS" file="file_manager/com mon/js/importer_common.js" flattenhtml="false" type="BINDATA" />
27 27
28 <!-- Scripts working in background page. --> 28 <!-- Scripts working in background page. -->
29 <include name="IDR_FILE_MANAGER_DEVICE_APP_WINDOW_WRAPPER_JS" file="file_m anager/background/js/app_window_wrapper.js" flattenhtml="false" type="BINDATA" / > 29 <include name="IDR_FILE_MANAGER_DEVICE_APP_WINDOW_WRAPPER_JS" file="file_m anager/background/js/app_window_wrapper.js" flattenhtml="false" type="BINDATA" / >
30 <include name="IDR_FILE_MANAGER_DEVICE_BACKGROUND_BASE_JS" file="file_mana ger/background/js/background_base.js" flattenhtml="false" type="BINDATA" /> 30 <include name="IDR_FILE_MANAGER_DEVICE_BACKGROUND_BASE_JS" file="file_mana ger/background/js/background_base.js" flattenhtml="false" type="BINDATA" />
31 <include name="IDR_FILE_MANAGER_DEVICE_HANDLER_JS" file="file_manager/back ground/js/device_handler.js" flattenhtml="false" type="BINDATA" /> 31 <include name="IDR_FILE_MANAGER_DEVICE_HANDLER_JS" file="file_manager/back ground/js/device_handler.js" flattenhtml="false" type="BINDATA" />
32 <include name="IDR_FILE_MANAGER_DRIVE_SYNC_HANDLER_JS" file="file_manager/ background/js/drive_sync_handler.js" flattenhtml="false" type="BINDATA" /> 32 <include name="IDR_FILE_MANAGER_DRIVE_SYNC_HANDLER_JS" file="file_manager/ background/js/drive_sync_handler.js" flattenhtml="false" type="BINDATA" />
33 <include name="IDR_FILE_MANAGER_DUPLICATE_FINDER_JS" file="file_manager/ba ckground/js/duplicate_finder.js" flattenhtml="false" type="BINDATA" />
33 <include name="IDR_FILE_MANAGER_FILE_OPERATION_HANDLER_JS" file="file_mana ger/background/js/file_operation_handler.js" flattenhtml="false" type="BINDATA" /> 34 <include name="IDR_FILE_MANAGER_FILE_OPERATION_HANDLER_JS" file="file_mana ger/background/js/file_operation_handler.js" flattenhtml="false" type="BINDATA" />
34 <include name="IDR_FILE_MANAGER_FILE_OPERATION_MANAGER_JS" file="file_mana ger/background/js/file_operation_manager.js" flattenhtml="false" type="BINDATA" /> 35 <include name="IDR_FILE_MANAGER_FILE_OPERATION_MANAGER_JS" file="file_mana ger/background/js/file_operation_manager.js" flattenhtml="false" type="BINDATA" />
35 <include name="IDR_FILE_MANAGER_FILE_OPERATION_UTIL_JS" file="file_manager /background/js/file_operation_util.js" flattenhtml="false" type="BINDATA" /> 36 <include name="IDR_FILE_MANAGER_FILE_OPERATION_UTIL_JS" file="file_manager /background/js/file_operation_util.js" flattenhtml="false" type="BINDATA" />
36 <include name="IDR_FILE_MANAGER_IMPORT_HISTORY_JS" file="file_manager/back ground/js/import_history.js" flattenhtml="false" type="BINDATA" /> 37 <include name="IDR_FILE_MANAGER_IMPORT_HISTORY_JS" file="file_manager/back ground/js/import_history.js" flattenhtml="false" type="BINDATA" />
37 <include name="IDR_FILE_MANAGER_TASK_QUEUE_JS" file="file_manager/backgrou nd/js/task_queue.js" flattenhtml="false" type="BINDATA" /> 38 <include name="IDR_FILE_MANAGER_TASK_QUEUE_JS" file="file_manager/backgrou nd/js/task_queue.js" flattenhtml="false" type="BINDATA" />
38 <include name="IDR_FILE_MANAGER_MEDIA_IMPORT_HANDLER_JS" file="file_manage r/background/js/media_import_handler.js" flattenhtml="false" type="BINDATA" /> 39 <include name="IDR_FILE_MANAGER_MEDIA_IMPORT_HANDLER_JS" file="file_manage r/background/js/media_import_handler.js" flattenhtml="false" type="BINDATA" />
39 <include name="IDR_FILE_MANAGER_MEDIA_SCANNER_JS" file="file_manager/backg round/js/media_scanner.js" flattenhtml="false" type="BINDATA" /> 40 <include name="IDR_FILE_MANAGER_MEDIA_SCANNER_JS" file="file_manager/backg round/js/media_scanner.js" flattenhtml="false" type="BINDATA" />
40 <include name="IDR_FILE_MANAGER_PROGRESS_CENTER_JS" file="file_manager/bac kground/js/progress_center.js" flattenhtml="false" type="BINDATA" /> 41 <include name="IDR_FILE_MANAGER_PROGRESS_CENTER_JS" file="file_manager/bac kground/js/progress_center.js" flattenhtml="false" type="BINDATA" />
41 <include name="IDR_FILE_MANAGER_TEST_UTIL_JS" file="file_manager/backgroun d/js/test_util.js" flattenhtml="false" type="BINDATA" /> 42 <include name="IDR_FILE_MANAGER_TEST_UTIL_JS" file="file_manager/backgroun d/js/test_util.js" flattenhtml="false" type="BINDATA" />
42 <include name="IDR_FILE_MANAGER_TEST_UTIL_BASE_JS" file="file_manager/back ground/js/test_util_base.js" flattenhtml="false" type="BINDATA" /> 43 <include name="IDR_FILE_MANAGER_TEST_UTIL_BASE_JS" file="file_manager/back ground/js/test_util_base.js" flattenhtml="false" type="BINDATA" />
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 <include name="IDR_IMAGE_LOADER_IMAGE_LOADER_JS" file="image_loader/imag e_loader.js" type="BINDATA" /> 139 <include name="IDR_IMAGE_LOADER_IMAGE_LOADER_JS" file="image_loader/imag e_loader.js" type="BINDATA" />
139 <include name="IDR_IMAGE_LOADER_CACHE_JS" file="image_loader/cache.js" t ype="BINDATA" /> 140 <include name="IDR_IMAGE_LOADER_CACHE_JS" file="image_loader/cache.js" t ype="BINDATA" />
140 <include name="IDR_IMAGE_LOADER_SCHEDULER_JS" file="image_loader/schedul er.js" type="BINDATA" /> 141 <include name="IDR_IMAGE_LOADER_SCHEDULER_JS" file="image_loader/schedul er.js" type="BINDATA" />
141 <include name="IDR_IMAGE_LOADER_REQUEST_JS" file="image_loader/request.j s" type="BINDATA" /> 142 <include name="IDR_IMAGE_LOADER_REQUEST_JS" file="image_loader/request.j s" type="BINDATA" />
142 <include name="IDR_IMAGE_LOADER_BACKGROUND_JS" file="image_loader/backgr ound.js" type="BINDATA" /> 143 <include name="IDR_IMAGE_LOADER_BACKGROUND_JS" file="image_loader/backgr ound.js" type="BINDATA" />
143 <include name="IDR_IMAGE_LOADER_CLIENT_JS" file="image_loader/image_load er_client.js" type="BINDATA" /> 144 <include name="IDR_IMAGE_LOADER_CLIENT_JS" file="image_loader/image_load er_client.js" type="BINDATA" />
144 </if> 145 </if>
145 </includes> 146 </includes>
146 </release> 147 </release>
147 </grit> 148 </grit>
OLDNEW
« no previous file with comments | « ui/file_manager/file_manager/manifest.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698