Re-land: Fix Website Settings crash with Plugins ASK setting.

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/grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 PermissionMenuModel::PermissionMenuModel(
@@ skipping 28 matching lines @@
   AddCheckItem(CONTENT_SETTING_DEFAULT, label);
 
   // Media only support CONTENTE_SETTTING_ALLOW for https.
   if (permission_.type != CONTENT_SETTINGS_TYPE_MEDIASTREAM ||
       url.SchemeIsSecure()) {
     label = l10n_util::GetStringUTF16(
         IDS_WEBSITE_SETTINGS_MENU_ITEM_ALLOW);
     AddCheckItem(CONTENT_SETTING_ALLOW, label);
   }
 
+  if (permission_.type == CONTENT_SETTINGS_TYPE_PLUGINS) {
+    label = l10n_util::GetStringUTF16(
+        IDS_WEBSITE_SETTINGS_MENU_ITEM_ASK);
+    AddCheckItem(CONTENT_SETTING_ASK, label);
+  }
+
   if (permission_.type != CONTENT_SETTINGS_TYPE_FULLSCREEN) {
     label = l10n_util::GetStringUTF16(
         IDS_WEBSITE_SETTINGS_MENU_ITEM_BLOCK);
     AddCheckItem(CONTENT_SETTING_BLOCK, label);
   }
 }
 
 PermissionMenuModel::PermissionMenuModel(const GURL& url,
                                          ContentSetting setting,
                                          const ChangeCallback& callback)
@@ skipping 22 matching lines @@
     int command_id,
     ui::Accelerator* accelerator) {
   // Accelerators are not supported.
   return false;
 }
 
 void PermissionMenuModel::ExecuteCommand(int command_id, int event_flags) {
   permission_.setting = static_cast<ContentSetting>(command_id);
   callback_.Run(permission_);
 }