chrome/browser/ui/webui/settings/md_settings_ui.cc - Issue 2039833004: Site Settings Desktop: Implement media picker for camera/mic categories.

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/settings/md_settings_ui.cc

Issue 2039833004: Site Settings Desktop: Implement media picker for camera/mic categories. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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/resources/settings/site_settings/site_settings_prefs_browser_proxy.js ('K') | « chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js ('k') | chrome/browser/ui/webui/settings/settings_media_devices_selection_handler.h » ('j') | chrome/browser/ui/webui/settings/settings_media_devices_selection_handler.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/settings/md_settings_ui.cc

diff --git a/chrome/browser/ui/webui/settings/md_settings_ui.cc b/chrome/browser/ui/webui/settings/md_settings_ui.cc

index b2ddfdec737bb9f02687f965084f2af28bc433ea..34a44f925a897a7780b1049abdff980deadf989a 100644

--- a/chrome/browser/ui/webui/settings/md_settings_ui.cc

+++ b/chrome/browser/ui/webui/settings/md_settings_ui.cc

@@ -21,6 +21,7 @@

#include "chrome/browser/ui/webui/settings/reset_settings_handler.h"

#include "chrome/browser/ui/webui/settings/search_engines_handler.h"

#include "chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h"

+#include "chrome/browser/ui/webui/settings/settings_media_devices_selection_handler.h"

#include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h"

#include "chrome/browser/ui/webui/settings/settings_startup_pages_handler.h"

#include "chrome/browser/ui/webui/settings/site_settings_handler.h"

@@ -64,6 +65,7 @@ MdSettingsUI::MdSettingsUI(content::WebUI* web_ui)

AddSettingsPageUIHandler(new ClearBrowsingDataHandler(web_ui));

AddSettingsPageUIHandler(new DownloadsHandler());

AddSettingsPageUIHandler(new FontHandler(web_ui));

+ AddSettingsPageUIHandler(new MediaDevicesSelectionHandler(web_ui));

michaelpg 2016/06/07 16:03:30 nit: keep alphabetical

Finnur 2016/06/07 16:48:23 Done.

AddSettingsPageUIHandler(new LanguagesHandler(web_ui));

AddSettingsPageUIHandler(new PeopleHandler(profile));

AddSettingsPageUIHandler(new ProfileInfoHandler(profile));