Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(299)

Unified Diff: chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc

Issue 1266583003: Fix the links in the media bubble pointing to the media UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: The definitions too. 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
« no previous file with comments | « chrome/browser/resources/options/content_settings.html ('k') | chrome/browser/ui/chrome_pages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..3faf64ffb5cd9593c5d9e63edb2f3c3f57d4255b 100644
--- a/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc
+++ b/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc
@@ -45,8 +45,16 @@ 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 of
+ // 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::ShowContentSettings(
+ browser_, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
default:
- chrome::ShowContentSettings(browser_, type);
+ chrome::ShowContentSettingsExceptions(browser_, type);
return;
}
}
« no previous file with comments | « chrome/browser/resources/options/content_settings.html ('k') | chrome/browser/ui/chrome_pages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698