views: use shorter menu strings in Harmony website settings

chrome/browser/ui/views/website_settings/permission_selector_row.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/views/website_settings/permission_selector_row.h"
 
 #include "base/i18n/rtl.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/website_settings/non_accessible_image_view.h"
@@ skipping 155 matching lines @@
 base::string16 ComboboxModelAdapter::GetItemAt(int index) {
   return model_->GetLabelAt(index);
 }
 
 // The |PermissionCombobox| provides a combobox for selecting a permission type.
 // This is only used on platforms where the permission dialog uses a combobox
 // instead of a MenuButton (currently, Mac).
 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;
 
   void UpdateSelectedIndex(bool use_default);
 
  private:
   // views::Combobox:
   void OnPaintBorder(gfx::Canvas* canvas) override;
 
   // views::ComboboxListener:
   void OnPerformAction(Combobox* combobox) override;
 
   ComboboxModelAdapter* model_;
 };
 
-PermissionCombobox::PermissionCombobox(const base::string16& text,
-                                       ComboboxModelAdapter* model,
+PermissionCombobox::PermissionCombobox(ComboboxModelAdapter* model,
                                        bool enabled,
                                        bool use_default)
     : views::Combobox(model), model_(model) {
   set_listener(this);
   SetEnabled(enabled);
   UpdateSelectedIndex(use_default);
   if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
     set_size_to_largest_label(false);
     ModelChanged();
   }
@@ skipping 122 matching lines @@
 }
 
 void PermissionSelectorRow::InitializeComboboxView(
     views::GridLayout* layout,
     const WebsiteSettingsUI::PermissionInfo& permission) {
   bool button_enabled =
       permission.source == content_settings::SETTING_SOURCE_USER;
   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(
       WebsiteSettingsUI::PermissionTypeToUIString(permission.type));
   layout->AddView(combobox_);
 }
 
 void PermissionSelectorRow::PermissionChanged(
     const WebsiteSettingsUI::PermissionInfo& permission) {
   // Change the permission icon to reflect the selected setting.
   const gfx::Image& image = WebsiteSettingsUI::GetPermissionIcon(permission);
   icon_->SetImage(image.ToImageSkia());
 
   // Update the menu button text to reflect the new setting.
   if (menu_button_) {
     menu_button_->SetText(WebsiteSettingsUI::PermissionActionToUIString(
         profile_, permission.type, permission.setting,
         permission.default_setting, content_settings::SETTING_SOURCE_USER));
     menu_button_->SizeToPreferredSize();
   } else if (combobox_) {
     bool use_default = permission.setting == CONTENT_SETTING_DEFAULT;
     combobox_->UpdateSelectedIndex(use_default);
   }
 
   for (PermissionSelectorRowObserver& observer : observer_list_)
     observer.OnPermissionChanged(permission);
 }