Settings: Make Enable DRM checkbox available on all platforms

chrome/browser/ui/webui/options/content_settings_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options/content_settings_handler.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 401 matching lines @@
     {"locationAllow", IDS_GEOLOCATION_ALLOW_RADIO},
     {"locationAsk", IDS_GEOLOCATION_ASK_RADIO},
     {"locationBlock", IDS_GEOLOCATION_BLOCK_RADIO},
     {"setBy", IDS_GEOLOCATION_SET_BY_HOVER},
     // Notifications filter.
     {"notificationsTabLabel", IDS_NOTIFICATIONS_TAB_LABEL},
     {"notificationsHeader", IDS_NOTIFICATIONS_HEADER},
     {"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},
+#if defined(OS_CHROMEOS)
     {"protectedContentHeader", IDS_PROTECTED_CONTENT_HEADER},

[stevenjb, 2017/02/07 21:43:52]

This appears to be unused in the code, as does the IDS, we should remove both.

[tommycli, 2017/02/07 22:11:44]

Hey, it's used here:
https://cs.chromium.org/chromium/src/chrome/browser/resources/options/content...

I tested it. It doesn't work if i remove this line.

[stevenjb, 2017/02/07 22:15:05]

Oh, ugh. That's the problem with generated ids. And that's only used by Chrome
OS? Given that that code is general purpose, it might be safer just to make this
string non cros specific also?

[tommycli, 2017/02/07 22:19:50]

Sure. I made the string crossplatform as well.

 #endif  // defined(OS_CHROMEOS) || defined(OS_WIN)
     // Microphone filter.
     {"mediaStreamMicTabLabel", IDS_MEDIA_STREAM_MIC_TAB_LABEL},
     {"mediaStreamMicHeader", IDS_MEDIA_STREAM_MIC_HEADER},
     {"mediaStreamMicAsk", IDS_MEDIA_STREAM_ASK_AUDIO_ONLY_RADIO},
     {"mediaStreamMicBlock", IDS_MEDIA_STREAM_BLOCK_AUDIO_ONLY_RADIO},
     // Camera filter.
     {"mediaStreamCameraTabLabel", IDS_MEDIA_STREAM_CAMERA_TAB_LABEL},
     {"mediaStreamCameraHeader", IDS_MEDIA_STREAM_CAMERA_HEADER},
     {"mediaStreamCameraAsk", IDS_MEDIA_STREAM_ASK_VIDEO_ONLY_RADIO},
@@ skipping 1053 matching lines @@
 
   // Exceptions apply only when the feature is enabled.
   PrefService* prefs = user_prefs::UserPrefs::Get(GetBrowserContext(web_ui()));
   bool enable_exceptions = prefs->GetBoolean(prefs::kEnableDRM);
   web_ui()->CallJavascriptFunctionUnsafe(
       "ContentSettings.enableProtectedContentExceptions",
       base::FundamentalValue(enable_exceptions));
 }
 
 }  // namespace options