chrome/browser/ui/webui/chromeos/emulator/device_emulator_ui.cc - Issue 2006083002: Use fake Input Device Settings with chrome://device-emulator

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/chromeos/emulator/device_emulator_ui.cc

Issue 2006083002: Use fake Input Device Settings with chrome://device-emulator (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@DevicePageTestsFixes

Patch Set: make dependent on a11y fix 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/emulator/device_emulator_ui.cc

diff --git a/chrome/browser/ui/webui/chromeos/emulator/device_emulator_ui.cc b/chrome/browser/ui/webui/chromeos/emulator/device_emulator_ui.cc

index a9fdf31b09ed68d3471cae0220317edb5d8a56a4..fbcb63567b97f55b31cf0119b44fa0c1ab01392d 100644

--- a/chrome/browser/ui/webui/chromeos/emulator/device_emulator_ui.cc

+++ b/chrome/browser/ui/webui/chromeos/emulator/device_emulator_ui.cc

@@ -35,6 +35,10 @@ content::WebUIDataSource* CreateDeviceEmulatorUIDataSource() {

html->AddResourcePath("bluetooth_settings.js",

IDR_DEVICE_EMULATOR_BLUETOOTH_SETTINGS_JS);

html->AddResourcePath("icons.html", IDR_DEVICE_EMULATOR_ICONS_HTML);

+ html->AddResourcePath("input_device_settings.html",

+ IDR_DEVICE_EMULATOR_INPUT_DEVICE_SETTINGS_HTML);

+ html->AddResourcePath("input_device_settings.js",

+ IDR_DEVICE_EMULATOR_INPUT_DEVICE_SETTINGS_JS);

html->AddResourcePath("device_emulator_pages.html",

IDR_DEVICE_EMULATOR_PAGES_HTML);

html->AddResourcePath("device_emulator_pages.js",