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

Unified Diff: chrome/browser/ui/gtk/website_settings_popup_gtk.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
Index: chrome/browser/ui/gtk/website_settings_popup_gtk.cc
diff --git a/chrome/browser/ui/gtk/website_settings_popup_gtk.cc b/chrome/browser/ui/gtk/website_settings_popup_gtk.cc
index 561f2ae8d348e0b0358826bb1d1229ae3cfa555a..f978b2130047ea1e80a5074206af9ca48e4935ea 100644
--- a/chrome/browser/ui/gtk/website_settings_popup_gtk.cc
+++ b/chrome/browser/ui/gtk/website_settings_popup_gtk.cc
@@ -386,18 +386,30 @@ void WebsiteSettingsPopupGtk::SetPermissionInfo(
gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT);
GtkTreeIter iter;
// Add option for permission "Global Default" to the combobox model.
- std::string setting_str = l10n_util::GetStringFUTF8(
- IDS_WEBSITE_SETTINGS_DEFAULT_PERMISSION_LABEL,
- WebsiteSettingsUI::PermissionValueToUIString(
- permission->default_setting));
+ std::string setting_str;
+ switch (permission->default_setting) {
+ case CONTENT_SETTING_ALLOW:
+ setting_str = l10n_util::GetStringUTF8(
+ IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_ALLOW);
+ break;
+ case CONTENT_SETTING_BLOCK:
+ setting_str = l10n_util::GetStringUTF8(
+ IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_BLOCK);
+ break;
+ case CONTENT_SETTING_ASK:
+ setting_str = l10n_util::GetStringUTF8(
+ IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_ASK);
+ break;
+ default:
+ break;
+ }
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter, 0, setting_str.c_str(), 1,
CONTENT_SETTING_DEFAULT, 2, permission->type, -1);
GtkWidget* combo_box = gtk_combo_box_new_with_model(GTK_TREE_MODEL(store));
// Add option for permission "Allow" to the combobox model.
- setting_str = l10n_util::GetStringFUTF8(
- IDS_WEBSITE_SETTINGS_PERMISSION_LABEL,
- WebsiteSettingsUI::PermissionValueToUIString(CONTENT_SETTING_ALLOW));
+ setting_str = l10n_util::GetStringUTF8(
+ IDS_WEBSITE_SETTINGS_MENU_ITEM_ALLOW);
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter, 0, setting_str.c_str(), 1,
CONTENT_SETTING_ALLOW, 2, permission->type, -1);
@@ -405,9 +417,8 @@ void WebsiteSettingsPopupGtk::SetPermissionInfo(
// blocking.
if (permission->type != CONTENT_SETTINGS_TYPE_FULLSCREEN) {
// Add option for permission "BLOCK" to the combobox model.
- setting_str = l10n_util::GetStringFUTF8(
- IDS_WEBSITE_SETTINGS_PERMISSION_LABEL,
- WebsiteSettingsUI::PermissionValueToUIString(CONTENT_SETTING_BLOCK));
+ setting_str = l10n_util::GetStringUTF8(
+ IDS_WEBSITE_SETTINGS_MENU_ITEM_BLOCK);
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter, 0, setting_str.c_str(), 1,
CONTENT_SETTING_BLOCK, 2, permission->type, -1);
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/views/website_settings/permission_selector_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698