chrome/browser/ui/webui/options/content_settings_handler.h - Issue 1210173012: Split the Media settings UI into separate microphone and camera sections.

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/options/content_settings_handler.h

Issue 1210173012: Split the Media settings UI into separate microphone and camera sections. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: UI updates Created 5 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

« chrome/browser/resources/options/content_settings.html ('K') | « chrome/browser/resources/options/content_settings_exceptions_area.js ('k') | chrome/browser/ui/webui/options/content_settings_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/content_settings_handler.h

diff --git a/chrome/browser/ui/webui/options/content_settings_handler.h b/chrome/browser/ui/webui/options/content_settings_handler.h

index 7ae81cb30b015f6d407d9b049f40a9468a8bc0fa..065b2e46089198de13e0265ff1ec51974de15e28 100644

--- a/chrome/browser/ui/webui/options/content_settings_handler.h

+++ b/chrome/browser/ui/webui/options/content_settings_handler.h

@@ -98,8 +98,9 @@ class ContentSettingsHandler : public OptionsPageUIHandler,

// Updates the page with the default settings (allow, ask, block, etc.)

void UpdateSettingDefaultFromModel(ContentSettingsType type);

- // Updates the media radio buttons according to the enabled split prefs.

- void UpdateMediaSettingsView();

+ // Compares the media default settings with flash and updates the flash links'

+ // visibility accordingly.

+ void CompareMediaSettingsWithFlash();

// Clobbers and rebuilds the specific content setting type exceptions table.

void UpdateExceptionsViewFromModel(ContentSettingsType type);

@@ -121,8 +122,9 @@ class ContentSettingsHandler : public OptionsPageUIHandler,

// Clobbers and rebuilds just the desktop notification exception table.

void UpdateNotificationExceptionsView();

- // Clobbers and rebuilds just the Media device exception table.

- void UpdateMediaExceptionsView();

+ // Compares the combined microphone and camera exceptions with Flash

+ // exceptions and updates the flash links' visibility accordingly.

+ void CompareMediaExceptionsWithFlash();

// Clobbers and rebuilds just the MIDI SysEx exception table.

void UpdateMIDISysExExceptionsView();

@@ -155,10 +157,6 @@ class ContentSettingsHandler : public OptionsPageUIHandler,

// to RemoveException().

void RemoveNotificationException(const base::ListValue* args);

- // Removes one media camera and microphone exception. |args| contains the

- // parameters passed to RemoveException().

- void RemoveMediaException(const base::ListValue* args);

// Removes one exception of |type| from the host content settings map. |args|

// contains the parameters passed to RemoveException().

void RemoveExceptionFromHostContentSettingsMap(