[HBD] Update Plugins type in Website Settings Permissions UI

chrome/browser/ui/website_settings/website_settings_ui.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/website_settings/website_settings_ui.h"
 
 #include "base/macros.h"
 #include "chrome/browser/plugins/plugins_field_trial.h"
+#include "chrome/common/chrome_features.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/strings/grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 namespace {
 
@@ skipping 62 matching lines @@
 const PermissionsUIInfo kPermissionsUIInfo[] = {
     {CONTENT_SETTINGS_TYPE_COOKIES, 0, IDR_BLOCKED_COOKIES,
      IDR_ACCESSED_COOKIES},
     {CONTENT_SETTINGS_TYPE_IMAGES, IDS_WEBSITE_SETTINGS_TYPE_IMAGES,
      IDR_BLOCKED_IMAGES, IDR_ALLOWED_IMAGES},
     {CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDS_WEBSITE_SETTINGS_TYPE_JAVASCRIPT,
      IDR_BLOCKED_JAVASCRIPT, IDR_ALLOWED_JAVASCRIPT},
     {CONTENT_SETTINGS_TYPE_POPUPS, IDS_WEBSITE_SETTINGS_TYPE_POPUPS,
      IDR_BLOCKED_POPUPS, IDR_ALLOWED_POPUPS},
 #if defined(ENABLE_PLUGINS)
-    {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_WEBSITE_SETTINGS_TYPE_PLUGINS,
-     IDR_BLOCKED_POPUPS, IDR_ALLOWED_PLUGINS},
+    {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_WEBSITE_SETTINGS_TYPE_FLASH,

[raymes, 2016/09/15 02:54:53]

As we discussed - we need to clarify/ensure this will only apply to flash and
not other custom plugins.

[raymes, 2016/09/15 03:21:34]

Now that I think about this more, I don't think this is really a problem for
Chrome. The only way a different plugin could get loaded is via command line
flags, which aren't really a supported use case. This may be a different story
for people with custom Chromium builds though, so we may want to consider
ensuring this only applies to flash.

[tommycli, 2016/09/15 16:40:45]

I filed this bug: https://bugs.chromium.org/p/chromium/issues/detail?id=647284

+     IDR_BLOCKED_PLUGINS, IDR_ALLOWED_PLUGINS},
 #endif
     {CONTENT_SETTINGS_TYPE_GEOLOCATION, IDS_WEBSITE_SETTINGS_TYPE_LOCATION,
      IDR_BLOCKED_LOCATION, IDR_ALLOWED_LOCATION},
     {CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
      IDS_WEBSITE_SETTINGS_TYPE_NOTIFICATIONS, IDR_BLOCKED_NOTIFICATION,
      IDR_ALLOWED_NOTIFICATION},
     {CONTENT_SETTINGS_TYPE_FULLSCREEN, IDS_WEBSITE_SETTINGS_TYPE_FULLSCREEN,
      IDR_ALLOWED_FULLSCREEN, IDR_ALLOWED_FULLSCREEN},
     {CONTENT_SETTINGS_TYPE_MOUSELOCK, IDS_WEBSITE_SETTINGS_TYPE_MOUSELOCK,
      IDR_BLOCKED_MOUSE_CURSOR, IDR_ALLOWED_MOUSE_CURSOR},
@@ skipping 117 matching lines @@
     ContentSetting setting,
     ContentSetting default_setting,
     content_settings::SettingSource source) {
   ContentSetting effective_setting = setting;
   if (effective_setting == CONTENT_SETTING_DEFAULT)
     effective_setting = default_setting;
 
 #if defined(ENABLE_PLUGINS)
   effective_setting =
       PluginsFieldTrial::EffectiveContentSetting(type, effective_setting);
+
+  // Display the UI string for ASK instead of DETECT for HTML5 by Default.
+  // TODO(tommycli): Once HTML5 by Default is shipped and the feature flag
+  // is removed, just migrate the actual content setting to ASK.
+  if (base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins) &&
+      effective_setting == CONTENT_SETTING_DETECT_IMPORTANT_CONTENT) {
+    effective_setting = CONTENT_SETTING_ASK;

[raymes, 2016/09/05 06:56:31]

I'm confused! In PluginsFieldTrial::EffectiveContentSetting there is a comment
which says "For Plugins, ASK is obsolete." and it returns
CONTENT_SETTING_DETECT_IMPORTANT_CONTENT if that feature is enabled, and then
here in that case we change it back to ask?

[tommycli, 2016/09/13 16:29:28]

It's unfortunate, but that's exactly what we want. Anyone with ASK in their
settings should get the DETECT behavior, since we don't support ASK anymore.
(Since Plugin Power Saver last year)

But for the HTML5 by Default feature, the behavior resembles ASK, and
eventually, once it's no longer a feature flag, we will migrate back to ASK. We
aren't actually migrating the settings yet because it's still shipping behind a
flag instead of permanently on.

It's unfortunate that we're flip flopping on the settings value, but we didn't
foresee the HTML5 by Default functionality when we worked on PPS.

And we can't just change EffectiveContentSetting, as that's used elsewhere in
the code also.

+  }
 #endif
 
   const int* button_text_ids = NULL;
   switch (source) {
     case content_settings::SETTING_SOURCE_USER:
       if (setting == CONTENT_SETTING_DEFAULT)
         button_text_ids = kPermissionButtonTextIDDefaultSetting;
       else
         button_text_ids = kPermissionButtonTextIDUserManaged;
       break;
@@ skipping 124 matching lines @@
   }
   return resource_id;
 }
 
 // static
 const gfx::Image& WebsiteSettingsUI::GetConnectionIcon(
     WebsiteSettings::SiteConnectionStatus status) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   return rb.GetNativeImageNamed(GetConnectionIconID(status));
 }