Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1183)

Unified Diff: chrome/browser/ui/website_settings/permission_menu_model.cc

Issue 790123003: Re-land: Fix Website Settings crash with Plugins ASK setting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/website_settings/website_settings_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/website_settings/permission_menu_model.cc
diff --git a/chrome/browser/ui/website_settings/permission_menu_model.cc b/chrome/browser/ui/website_settings/permission_menu_model.cc
index f9e0803130a09709d981a6d346d75a9cddaada33..71456636005ce55c5707f83424eab540a0074a89 100644
--- a/chrome/browser/ui/website_settings/permission_menu_model.cc
+++ b/chrome/browser/ui/website_settings/permission_menu_model.cc
@@ -46,6 +46,12 @@ PermissionMenuModel::PermissionMenuModel(
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);
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/website_settings/website_settings_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698