Chromium Code Reviews| Index: chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc |
| diff --git a/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc b/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc |
| index 08906320e9fdfb86f9747a7eddc3ec83f62651a0..81c8e9f32b5bd6745243fd0d08402409079aab23 100644 |
| --- a/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc |
| +++ b/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc |
| @@ -45,6 +45,14 @@ void BrowserContentSettingBubbleModelDelegate::ShowContentSettingsPage( |
| case CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS: |
| chrome::ShowSettingsSubPage(browser_, chrome::kHandlerSettingsSubPage); |
| return; |
| + case CONTENT_SETTINGS_TYPE_MEDIASTREAM: |
| + // If the user requested to see the settings page for both camera |
| + // and microphone, point them to the default settings instead |
|
msw
2015/07/30 17:15:26
nit: "instead of"?
msramek
2015/07/31 12:34:52
Done.
|
| + // exceptions, as camera and microphone exceptions are now in two |
| + // different overlays. Specifically, point them to the microphone |
| + // default settings, as those appear first in the list. |
| + chrome::ShowDefaultContentSettings( |
| + browser_, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC); |
| default: |
| chrome::ShowContentSettings(browser_, type); |
| return; |