chrome/browser/ui/webui/chromeos/emulator/device_emulator_ui.cc - Issue 1274403003: Full Implementation of Audio for the Chrome Os 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 1274403003: Full Implementation of Audio for the Chrome Os Device Emulator (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Initial Patch Created 5 years, 4 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

« chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc ('K') | « chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc ('k') | chromeos/dbus/fake_cras_audio_client.h » ('j') | chromeos/dbus/fake_cras_audio_client.cc » ('J')
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 ba8fd7b3bb8eff7c4c5fbeef16bbcc7351990507..1c549ee1d63721b1e04050daf2d7ee71c290442a 100644

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

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

@@ -27,6 +27,9 @@ content::WebUIDataSource* CreateDeviceEmulatorUIDataSource() {

// Add resources.

html->AddResourcePath("device_emulator.css", IDR_DEVICE_EMULATOR_CSS);

html->AddResourcePath("device_emulator.js", IDR_DEVICE_EMULATOR_JS);

+ html->AddResourcePath("audio_settings.html", IDR_AUDIO_SETTINGS_HTML);

+ html->AddResourcePath("audio_settings.css", IDR_AUDIO_SETTINGS_CSS);

+ html->AddResourcePath("audio_settings.js", IDR_AUDIO_SETTINGS_JS);

html->AddResourcePath("battery_settings.html", IDR_BATTERY_SETTINGS_HTML);

html->AddResourcePath("battery_settings.css", IDR_BATTERY_SETTINGS_CSS);

html->AddResourcePath("battery_settings.js", IDR_BATTERY_SETTINGS_JS);