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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/webui/options/content_settings_handler.h

Issue 965103004: Stop using the MEDIASTREAM content setting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase over 1004733003. Created 5 years, 9 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/media/media_stream_devices_controller.cc ('k') | chrome/browser/ui/webui/options/content_settings_handler.cc » ('j') | components/content_settings/core/browser/content_settings_default_provider.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 2abb4d1f78fcc7c9bb56a76cbcbcf96221b3c6db..7ae81cb30b015f6d407d9b049f40a9468a8bc0fa 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.h
+++ b/chrome/browser/ui/webui/options/content_settings_handler.h
@@ -78,10 +78,11 @@ class ContentSettingsHandler : public OptionsPageUIHandler,
bool show_flash_exceptions_link;
// Cached Chrome media settings.
- ContentSetting default_setting;
+ ContentSetting default_audio_setting;
+ ContentSetting default_video_setting;
bool policy_disable_audio;
bool policy_disable_video;
- bool default_setting_initialized;
+ bool default_settings_initialized;
MediaExceptions exceptions;
bool exceptions_initialized;
};
« no previous file with comments | « chrome/browser/media/media_stream_devices_controller.cc ('k') | chrome/browser/ui/webui/options/content_settings_handler.cc » ('j') | components/content_settings/core/browser/content_settings_default_provider.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698