chrome/browser/resources/settings/settings_resources.grd - Issue 2110833003: MD Settings: Add mouse settings, update pointer settings

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

Issue 2110833003: MD Settings: Add mouse settings, update pointer settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@PointersFake

Patch Set: 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

« chrome/browser/resources/settings/device_page/pointers.html ('K') | « chrome/browser/resources/settings/settings_page/settings_router.js ('k') | chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h » ('j') | chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.cc » ('J')
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 348 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
359 type="chrome_html" />	359 type="chrome_html" />

360 <structure name="IDR_SETTINGS_DEVICE_KEYBOARD_JS"	360 <structure name="IDR_SETTINGS_DEVICE_KEYBOARD_JS"

361 file="device_page/keyboard.js"	361 file="device_page/keyboard.js"

362 type="chrome_html" />	362 type="chrome_html" />

363 <structure name="IDR_SETTINGS_DEVICE_PAGE_HTML"	363 <structure name="IDR_SETTINGS_DEVICE_PAGE_HTML"

364 file="device_page/device_page.html"	364 file="device_page/device_page.html"

365 type="chrome_html" />	365 type="chrome_html" />

366 <structure name="IDR_SETTINGS_DEVICE_PAGE_JS"	366 <structure name="IDR_SETTINGS_DEVICE_PAGE_JS"

367 file="device_page/device_page.js"	367 file="device_page/device_page.js"

368 type="chrome_html" />	368 type="chrome_html" />

369 <structure name="IDR_SETTINGS_DEVICE_TOUCHPAD_HTML"	369 <structure name="IDR_SETTINGS_DEVICE_POINTERS_HTML"

370 file="device_page/touchpad.html"	370 file="device_page/pointers.html"

371 type="chrome_html" />	371 type="chrome_html" />

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

373 file="device_page/touchpad.js"	373 file="device_page/pointers.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 </if>	381 </if>

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

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

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

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

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

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

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

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

936 </if>	936 </if>

937 </structures>	937 </structures>

938 </release>	938 </release>

939 </grit>	939 </grit>

OLD	NEW