[HBD] Update Plugins type in Website Settings Permissions UI

chrome/browser/ui/website_settings/permission_menu_model.cc

Index: chrome/browser/ui/website_settings/permission_menu_model.cc
diff --git a/chrome/browser/ui/website_settings/permission_menu_model.cc b/chrome/browser/ui/website_settings/permission_menu_model.cc
index e644f4982ac0f637d08f7258c28ec9401d092a62..3310a3e8c0e454a05843d0bca592f51bf5650587 100644
--- a/chrome/browser/ui/website_settings/permission_menu_model.cc
+++ b/chrome/browser/ui/website_settings/permission_menu_model.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/website_settings/permission_menu_model.h"
 
 #include "chrome/browser/plugins/plugins_field_trial.h"
+#include "chrome/common/chrome_features.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/common/origin_util.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -38,8 +39,12 @@ PermissionMenuModel::PermissionMenuModel(
           l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_ASK);
       break;
     case CONTENT_SETTING_DETECT_IMPORTANT_CONTENT:
+      // TODO(tommycli): Once HTML5 by Default is shipped and the feature flag
+      // is removed, just migrate the actual content setting to ASK.
       label = l10n_util::GetStringUTF16(
-          IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_DETECT_IMPORTANT_CONTENT);
+          base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins)

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

nit: Please add a comment explaining why we display the ask label for detect
important content.

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

Done.

+              ? IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_ASK
+              : IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_DETECT_IMPORTANT_CONTENT);
       break;
     case CONTENT_SETTING_NUM_SETTINGS:
       NOTREACHED();
@@ -73,7 +78,8 @@ PermissionMenuModel::PermissionMenuModel(
     AddCheckItem(CONTENT_SETTING_ALLOW, label);
   }
 
-  if (permission_.type == CONTENT_SETTINGS_TYPE_PLUGINS) {
+  if (permission_.type == CONTENT_SETTINGS_TYPE_PLUGINS &&
+      !base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins)) {

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

nit: Please add a comment here explaining why we don't add the detect important
content option in this case

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

Done.

     label = l10n_util::GetStringUTF16(
         IDS_WEBSITE_SETTINGS_MENU_ITEM_DETECT_IMPORTANT_CONTENT);
     AddCheckItem(CONTENT_SETTING_DETECT_IMPORTANT_CONTENT, label);