chrome/browser/resources/settings/settings_resources.grd - Issue 2097763004: MD Settings: Display: Add snapping and collisions

Side by Side Diff: chrome/browser/resources/settings/settings_resources.grd

Issue 2097763004: MD Settings: Display: Add snapping and collisions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_547080_display_settings8a_drag

Patch Set: Rebase + More Feedback Created 4 years, 5 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 | « chrome/browser/resources/settings/device_page/layout_behavior.js ('k') | third_party/closure_compiler/externs/system_display.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/settings_resources.h" type="rc_header">	4 <output filename="grit/settings_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/settings_resources_map.cc"	7 <output filename="grit/settings_resources_map.cc"

8 type="resource_file_map_source" />	8 type="resource_file_map_source" />

9 <output filename="grit/settings_resources_map.h"	9 <output filename="grit/settings_resources_map.h"

10 type="resource_map_header" />	10 type="resource_map_header" />

(...skipping 360 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
371 type="chrome_html" />	371 type="chrome_html" />

372 <structure name="IDR_SETTINGS_DEVICE_TOUCHPAD_JS"	372 <structure name="IDR_SETTINGS_DEVICE_TOUCHPAD_JS"

373 file="device_page/touchpad.js"	373 file="device_page/touchpad.js"

374 type="chrome_html" />	374 type="chrome_html" />

375 <structure name="IDR_SETTINGS_DEVICE_DRAG_BEHAVIOR_HTML"	375 <structure name="IDR_SETTINGS_DEVICE_DRAG_BEHAVIOR_HTML"

376 file="device_page/drag_behavior.html"	376 file="device_page/drag_behavior.html"

377 type="chrome_html" />	377 type="chrome_html" />

378 <structure name="IDR_SETTINGS_DEVICE_DRAG_BEHAVIOR_JS"	378 <structure name="IDR_SETTINGS_DEVICE_DRAG_BEHAVIOR_JS"

379 file="device_page/drag_behavior.js"	379 file="device_page/drag_behavior.js"

380 type="chrome_html" />	380 type="chrome_html" />

	381 <structure name="IDR_SETTINGS_DEVICE_LAYOUT_BEHAVIOR_HTML"

	382 file="device_page/layout_behavior.html"

	383 type="chrome_html" />

	384 <structure name="IDR_SETTINGS_DEVICE_LAYOUT_BEHAVIOR_JS"

	385 file="device_page/layout_behavior.js"

	386 type="chrome_html" />

381 </if>	387 </if>

382 <structure name="IDR_SETTINGS_DIRECTION_DELEGATE_HTML"	388 <structure name="IDR_SETTINGS_DIRECTION_DELEGATE_HTML"

383 file="direction_delegate.html"	389 file="direction_delegate.html"

384 type="chrome_html" />	390 type="chrome_html" />

385 <structure name="IDR_SETTINGS_DIRECTION_DELEGATE_JS"	391 <structure name="IDR_SETTINGS_DIRECTION_DELEGATE_JS"

386 file="direction_delegate.js"	392 file="direction_delegate.js"

387 type="chrome_html" />	393 type="chrome_html" />

388 <structure name="IDR_SETTINGS_DOWNLOADS_PAGE_HTML"	394 <structure name="IDR_SETTINGS_DOWNLOADS_PAGE_HTML"

389 file="downloads_page/downloads_page.html"	395 file="downloads_page/downloads_page.html"

390 type="chrome_html"	396 type="chrome_html"

(...skipping 539 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
930 type="chrome_html" />	936 type="chrome_html" />

931 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"	937 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"

932 file="people_page/users_page.html"	938 file="people_page/users_page.html"

933 type="chrome_html"	939 type="chrome_html"

934 flattenhtml="true"	940 flattenhtml="true"

935 allowexternalscript="true" />	941 allowexternalscript="true" />

936 </if>	942 </if>

937 </structures>	943 </structures>

938 </release>	944 </release>

939 </grit>	945 </grit>

OLD	NEW