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

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

Issue 2715233004: views: use shorter menu strings in Harmony website settings (Closed)
Patch Set: Created 3 years, 10 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 | « no previous file | chrome/browser/ui/website_settings/permission_menu_model.cc » ('j') | 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_row.cc
diff --git a/chrome/browser/ui/views/website_settings/permission_selector_row.cc b/chrome/browser/ui/views/website_settings/permission_selector_row.cc
index 6ba6b2270d3ba19f4234df92eedff4dec45a2154..6554daec10b2769623e71d0723b3d44fcfe9f88c 100644
--- a/chrome/browser/ui/views/website_settings/permission_selector_row.cc
+++ b/chrome/browser/ui/views/website_settings/permission_selector_row.cc
@@ -173,8 +173,7 @@ base::string16 ComboboxModelAdapter::GetItemAt(int index) {
class PermissionCombobox : public views::Combobox,
public views::ComboboxListener {
public:
- PermissionCombobox(const base::string16& text,
- ComboboxModelAdapter* model,
+ PermissionCombobox(ComboboxModelAdapter* model,
bool enabled,
bool use_default);
~PermissionCombobox() override;
@@ -191,8 +190,7 @@ class PermissionCombobox : public views::Combobox,
ComboboxModelAdapter* model_;
};
-PermissionCombobox::PermissionCombobox(const base::string16& text,
- ComboboxModelAdapter* model,
+PermissionCombobox::PermissionCombobox(ComboboxModelAdapter* model,
bool enabled,
bool use_default)
: views::Combobox(model), model_(model) {
@@ -335,9 +333,6 @@ void PermissionSelectorRow::InitializeComboboxView(
combobox_model_adapter_.reset(
new internal::ComboboxModelAdapter(menu_model_.get()));
combobox_ = new internal::PermissionCombobox(
- WebsiteSettingsUI::PermissionActionToUIString(
- profile_, permission.type, permission.setting,
- permission.default_setting, permission.source),
combobox_model_adapter_.get(), button_enabled, true);
combobox_->SetEnabled(button_enabled);
combobox_->SetAccessibleName(
« no previous file with comments | « no previous file | chrome/browser/ui/website_settings/permission_menu_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698