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

Unified Diff: chrome/browser/ui/views/website_settings/permission_selector_view.cc

Issue 10855031: Add UI string for the permissions drop downs of the Website Settings UI that are easy to localize. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: " Created 8 years, 4 months 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/browser/ui/gtk/website_settings_popup_gtk.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/website_settings/permission_selector_view.cc
diff --git a/chrome/browser/ui/views/website_settings/permission_selector_view.cc b/chrome/browser/ui/views/website_settings/permission_selector_view.cc
index fa6f0094da18c80c07b636fec3c490b82eb05324..85dc1f384ae5c91a1ea0828adb92f0649a042107 100644
--- a/chrome/browser/ui/views/website_settings/permission_selector_view.cc
+++ b/chrome/browser/ui/views/website_settings/permission_selector_view.cc
@@ -128,20 +128,32 @@ PermissionMenuModel::PermissionMenuModel(
default_setting_(default_setting),
current_setting_(current_setting),
permission_selector_(parent) {
- string16 label = l10n_util::GetStringFUTF16(
- IDS_WEBSITE_SETTINGS_DEFAULT_PERMISSION_LABEL,
- WebsiteSettingsUI::PermissionValueToUIString(default_setting_));
+ string16 label;
+ switch (default_setting_) {
+ case CONTENT_SETTING_ALLOW:
+ label = l10n_util::GetStringUTF16(
+ IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_ALLOW);
+ break;
+ case CONTENT_SETTING_BLOCK:
+ 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;
+ default:
+ break;
+ }
AddCheckItem(COMMAND_SET_TO_DEFAULT, label);
- label = l10n_util::GetStringFUTF16(
- IDS_WEBSITE_SETTINGS_PERMISSION_LABEL,
- WebsiteSettingsUI::PermissionValueToUIString(CONTENT_SETTING_ALLOW));
+ label = l10n_util::GetStringUTF16(
+ IDS_WEBSITE_SETTINGS_MENU_ITEM_ALLOW);
AddCheckItem(COMMAND_SET_TO_ALLOW, label);
if (site_permission != CONTENT_SETTINGS_TYPE_FULLSCREEN) {
- label = l10n_util::GetStringFUTF16(
- IDS_WEBSITE_SETTINGS_PERMISSION_LABEL,
- WebsiteSettingsUI::PermissionValueToUIString(CONTENT_SETTING_BLOCK));
+ label = l10n_util::GetStringUTF16(
+ IDS_WEBSITE_SETTINGS_MENU_ITEM_BLOCK);
AddCheckItem(COMMAND_SET_TO_BLOCK, label);
}
}
« no previous file with comments | « chrome/browser/ui/gtk/website_settings_popup_gtk.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698