Deleted CONTENT_SETTINGS_TYPE_FULLSCREEN and MOUSELOCK.

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 44 matching lines @@
               ? 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
-  // a reasonable origin with which to associate the preference.
-  // TODO(estark): Revisit this when crbug.com/455882 is fixed.
-  bool is_exclusive_access_on_file =
-      (permission_.type == CONTENT_SETTINGS_TYPE_FULLSCREEN ||
-       permission_.type == CONTENT_SETTINGS_TYPE_MOUSELOCK) &&
-      url.SchemeIsFile();
-
   // 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)) &&
-      !is_exclusive_access_on_file) {
+      (!is_media_permission || content::IsOriginSecure(url))) {
     label = l10n_util::GetStringUTF16(
         IDS_WEBSITE_SETTINGS_MENU_ITEM_ALLOW);
     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_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);
-  }
+  label = l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_MENU_ITEM_BLOCK);
+  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)),
       callback_(callback) {
@@ skipping 21 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_);
 }