[subresource_filter] Add custom strings/behavior on Desktop Page Info

chrome/browser/ui/page_info/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/page_info/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 52 matching lines @@
 
   // 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.
   if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
     label = PageInfoUI::PermissionActionToUIString(
         profile, permission_.type, CONTENT_SETTING_DEFAULT,
         effective_default_setting, permission_.source);
   }
 
-  AddCheckItem(CONTENT_SETTING_DEFAULT, label);
+  bool subresource_filter_permission =
+      permission_.type == CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER;
+
+  // The subresource filter permission does not display the default menu item.
+  if (!subresource_filter_permission)
+    AddCheckItem(CONTENT_SETTING_DEFAULT, label);
 
   // Retrieve the string to show for allowing the permission.
   // Notifications does not support CONTENT_SETTING_ALLOW in incognito.
   bool allow_disabled_for_notifications =
       permission_.is_incognito &&
       permission_.type == CONTENT_SETTINGS_TYPE_NOTIFICATIONS;
   // Media only supports CONTENT_SETTTING_ALLOW for secure origins.
   bool is_media_permission =
       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))) {
     label = l10n_util::GetStringUTF16(IDS_PAGE_INFO_MENU_ITEM_ALLOW);
     if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
       label = PageInfoUI::PermissionActionToUIString(
           profile, permission_.type, CONTENT_SETTING_ALLOW,
           effective_default_setting, permission_.source);
     }
+
+    if (subresource_filter_permission)
+      label = l10n_util::GetStringUTF16(IDS_PAGE_INFO_SUBRESOURCE_FILTER_ALLOW);

[raymes, 2017/05/15 23:41:21]

Why can't we just leave this as IDS_PAGE_INFO_MENU_ITEM_ALLOW ?

[Charlie Harrison, 2017/05/16 01:47:26]

We will eventually want the string to be slightly different than that one, but
for now they are identical as a placeholder. This way when we land the final
string we only have to update the resource file.

[raymes, 2017/05/16 06:19:51]

Oh - I thought it would always be the same as before? How will it be different?

[Charlie Harrison, 2017/05/16 12:10:14]

Followed up offline.

+
     AddCheckItem(CONTENT_SETTING_ALLOW, label);
   }
 
   // TODO(tommycli): With the HTML5 by Default feature, Flash is treated the
   // same as any other permission with ASK, i.e. there is no ASK exception.
   // Once the feature flag is gone, remove this block of code entirely.
   if (permission_.type == CONTENT_SETTINGS_TYPE_PLUGINS &&
       !PluginUtils::ShouldPreferHtmlOverPlugins(host_content_settings_map_)) {
     label = l10n_util::GetStringUTF16(
         IDS_PAGE_INFO_MENU_ITEM_DETECT_IMPORTANT_CONTENT);
     AddCheckItem(CONTENT_SETTING_DETECT_IMPORTANT_CONTENT, label);
   }
 
   // Retrieve the string to show for blocking the permission.
   label = l10n_util::GetStringUTF16(IDS_PAGE_INFO_MENU_ITEM_BLOCK);
   if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
     label = PageInfoUI::PermissionActionToUIString(
         profile, info.type, CONTENT_SETTING_BLOCK, effective_default_setting,
         info.source);
   }
+  if (subresource_filter_permission)
+    label = l10n_util::GetStringUTF16(IDS_PAGE_INFO_SUBRESOURCE_FILTER_BLOCK);

[raymes, 2017/05/15 23:41:21]

I think we can move this up above the if (..) statement. If that flag is
enabled, I think the strings will just be "Allow" and "Block" for all
permissions, which seems appropriate here?

[Charlie Harrison, 2017/05/16 01:47:26]

You mean the IsSecondaryUiMaterial if statement? Done.

   AddCheckItem(CONTENT_SETTING_BLOCK, label);
 }
 
 PermissionMenuModel::PermissionMenuModel(Profile* profile,
                                          const GURL& url,
                                          ContentSetting setting,
                                          const ChangeCallback& callback)
     : ui::SimpleMenuModel(this),
       host_content_settings_map_(
           HostContentSettingsMapFactory::GetForProfile(profile)),
@@ skipping 22 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_);
 }