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: Close when pointers disconnected 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/settings_page/settings_router.js ('k') | chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h » ('j') | chrome/test/data/webui/settings/device_page_tests.js » ('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 382 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
393 type="chrome_html" />	393 type="chrome_html" />

394 <structure name="IDR_SETTINGS_DEVICE_KEYBOARD_JS"	394 <structure name="IDR_SETTINGS_DEVICE_KEYBOARD_JS"

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

396 type="chrome_html" />	396 type="chrome_html" />

397 <structure name="IDR_SETTINGS_DEVICE_PAGE_HTML"	397 <structure name="IDR_SETTINGS_DEVICE_PAGE_HTML"

398 file="device_page/device_page.html"	398 file="device_page/device_page.html"

399 type="chrome_html" />	399 type="chrome_html" />

400 <structure name="IDR_SETTINGS_DEVICE_PAGE_JS"	400 <structure name="IDR_SETTINGS_DEVICE_PAGE_JS"

401 file="device_page/device_page.js"	401 file="device_page/device_page.js"

402 type="chrome_html" />	402 type="chrome_html" />

403 <structure name="IDR_SETTINGS_DEVICE_TOUCHPAD_HTML"	403 <structure name="IDR_SETTINGS_DEVICE_POINTERS_HTML"

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

405 type="chrome_html" />	405 type="chrome_html" />

406 <structure name="IDR_SETTINGS_DEVICE_TOUCHPAD_JS"	406 <structure name="IDR_SETTINGS_DEVICE_POINTERS_JS"

407 file="device_page/touchpad.js"	407 file="device_page/pointers.js"

408 type="chrome_html" />	408 type="chrome_html" />

409 <structure name="IDR_SETTINGS_DEVICE_DRAG_BEHAVIOR_HTML"	409 <structure name="IDR_SETTINGS_DEVICE_DRAG_BEHAVIOR_HTML"

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

411 type="chrome_html" />	411 type="chrome_html" />

412 <structure name="IDR_SETTINGS_DEVICE_DRAG_BEHAVIOR_JS"	412 <structure name="IDR_SETTINGS_DEVICE_DRAG_BEHAVIOR_JS"

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

414 type="chrome_html" />	414 type="chrome_html" />

415 <structure name="IDR_SETTINGS_DEVICE_LAYOUT_BEHAVIOR_HTML"	415 <structure name="IDR_SETTINGS_DEVICE_LAYOUT_BEHAVIOR_HTML"

416 file="device_page/layout_behavior.html"	416 file="device_page/layout_behavior.html"

417 type="chrome_html" />	417 type="chrome_html" />

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

999 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"	999 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"

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

1001 type="chrome_html"	1001 type="chrome_html"

1002 flattenhtml="true"	1002 flattenhtml="true"

1003 allowexternalscript="true" />	1003 allowexternalscript="true" />

1004 </if>	1004 </if>

1005 </structures>	1005 </structures>

1006 </release>	1006 </release>

1007 </grit>	1007 </grit>

OLD	NEW