[HBD] Update Plugins type in Website Settings Permissions UI

chrome/browser/ui/website_settings/permission_menu_model.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/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"
 
 PermissionMenuModel::PermissionMenuModel(
     const GURL& url,
     const WebsiteSettingsUI::PermissionInfo& info,
     const ChangeCallback& callback)
     : ui::SimpleMenuModel(this), permission_(info), callback_(callback) {
   DCHECK(!callback_.is_null());
@@ skipping 13 matching lines @@
       break;
     case CONTENT_SETTING_BLOCK:
       label = l10n_util::GetStringUTF16(
           IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_BLOCK);
       break;
     case CONTENT_SETTING_ASK:
       label =
           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();
     default:
       break;
   }
   AddCheckItem(CONTENT_SETTING_DEFAULT, label);
 
   // CONTENT_SETTING_ALLOW and CONTENT_SETTING_BLOCK are not allowed for
   // fullscreen or mouse lock on file:// URLs, because there wouldn't be
@@ skipping 13 matching lines @@
       permission_.type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC ||
       permission_.type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA;
   if (!allow_disabled_for_notifications &&
       (!is_media_permission || content::IsOriginSecure(url)) &&
       !is_exclusive_access_on_file) {
     label = l10n_util::GetStringUTF16(
         IDS_WEBSITE_SETTINGS_MENU_ITEM_ALLOW);
     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);
   }
 
   if (permission_.type != CONTENT_SETTINGS_TYPE_FULLSCREEN &&
       !is_exclusive_access_on_file) {
     label = l10n_util::GetStringUTF16(
         IDS_WEBSITE_SETTINGS_MENU_ITEM_BLOCK);
     AddCheckItem(CONTENT_SETTING_BLOCK, label);
@@ skipping 28 matching lines @@
 }
 
 bool PermissionMenuModel::IsCommandIdEnabled(int command_id) const {
   return true;
 }
 
 void PermissionMenuModel::ExecuteCommand(int command_id, int event_flags) {
   permission_.setting = static_cast<ContentSetting>(command_id);
   callback_.Run(permission_);
 }