Stop pretending that a Flash setting of DETECT_IMPORTANT_CONTENT is ASK.

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/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/plugins/plugin_utils.h"
 #include "chrome/browser/plugins/plugins_field_trial.h"
 #include "chrome/common/chrome_features.h"
@@ skipping 33 matching lines @@
       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): We display the ASK string for DETECT because with
       // HTML5 by Default, Chrome will ask before running Flash on most sites.
       // Once the feature flag is gone, migrate the actual setting to ASK.

[raymes, 2017/03/05 23:56:50]

I think this TODO is inaccurate now?

[tommycli, 2017/03/06 19:10:26]

Yes that's right. it's inaccurate. Though maybe it should be replaced with a
TODO that says it should always be ASK once HBD's SEI threshold is turned all
the way up.

       label = l10n_util::GetStringUTF16(
-          PluginUtils::ShouldPreferHtmlOverPlugins(host_content_settings_map_)
-              ? IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_ASK
-              : IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_DETECT_IMPORTANT_CONTENT);
+          IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_DETECT_IMPORTANT_CONTENT);
       break;
     case CONTENT_SETTING_NUM_SETTINGS:
       NOTREACHED();
     default:
       break;
   }
 
   // The Material UI for site settings uses comboboxes instead of menubuttons,
   // which means the elements of the menu themselves have to be shorter, instead
   // of simply setting a shorter label on the menubutton.
@@ skipping 66 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_);
 }