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

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

Issue 2679723003: Settings: Make Enable DRM checkbox available on all platforms (Closed)
Patch Set: make string xplatform Created 3 years, 10 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') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/content_settings_handler.cc
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc
index e98857f9c9c0bdb8713ba965e5d94a789072759b..00679d9cde8e572b1fec971f4a498a79dd0c8d83 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
@@ -419,13 +419,11 @@ void ContentSettingsHandler::GetLocalizedValues(
{"notificationsAllow", IDS_NOTIFICATIONS_ALLOW_RADIO},
{"notificationsAsk", IDS_NOTIFICATIONS_ASK_RADIO},
{"notificationsBlock", IDS_NOTIFICATIONS_BLOCK_RADIO},
-#if defined(OS_CHROMEOS) || defined(OS_WIN)
// Protected Content filter
{"protectedContentTabLabel", IDS_PROTECTED_CONTENT_TAB_LABEL},
{"protectedContentInfo", IDS_PROTECTED_CONTENT_INFO},
{"protectedContentEnable", IDS_PROTECTED_CONTENT_ENABLE},
{"protectedContentHeader", IDS_PROTECTED_CONTENT_HEADER},
-#endif // defined(OS_CHROMEOS) || defined(OS_WIN)
// Microphone filter.
{"mediaStreamMicTabLabel", IDS_MEDIA_STREAM_MIC_TAB_LABEL},
{"mediaStreamMicHeader", IDS_MEDIA_STREAM_MIC_HEADER},
« no previous file with comments | « chrome/browser/resources/options/content_settings.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698