Views/Permissions: Update desktop UI to display BLOCK for embargoed permissions.

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/permissions/permission_manager.h"
+#include "chrome/browser/permissions/permission_result.h"
+#include "chrome/browser/permissions/permission_util.h"
 #include "chrome/browser/ui/views/website_settings/non_accessible_image_view.h"
 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h"
 #include "chrome/browser/ui/website_settings/permission_menu_model.h"
 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
 #include "chrome/grit/generated_resources.h"
+#include "content/public/browser/permission_type.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_runner.h"
@@ skipping 247 matching lines @@
       base::Bind(&PermissionSelectorRow::PermissionChanged,
                  base::Unretained(this))));
 
   // Create the permission menu button.
 #if defined(OS_MACOSX)
   bool use_real_combobox = true;
 #else
   bool use_real_combobox =
       ui::MaterialDesignController::IsSecondaryUiMaterial();
 #endif
+
+  bool user_editable =
+      permission.source == content_settings::SettingSource::SETTING_SOURCE_USER;
+  // Permissions blocked under the kill switch shouldn't be editable.
+  content::PermissionType unused = content::PermissionType::NUM;
+  if (permission.setting == CONTENT_SETTING_BLOCK &&
+      PermissionUtil::GetPermissionType(permission.type, &unused)) {
+    PermissionResult permission_result =
+        PermissionManager::Get(profile_)->GetPermissionStatus(permission.type,
+                                                              url, url);
+    if (permission_result.source == PermissionStatusSource::KILL_SWITCH)
+      user_editable = false;
+  }

[raymes, 2017/03/06 03:55:05]

Hmm, this will make the box uneditable if the user had set the permission to
"Block" but not if they had set it to "Allow". That seems a bit inconsistent? If
we did make it uneditable for "Allow" that would also be confusing.

Is this bit orthogonal to the other change? It doesn't seem too urgent to change
this since it's been like that for ages. I think it could be better to address
this as a part of a larger refactoring of this UI/code. Also would we want to
merge this if we did land it?

[Patti Lor, 2017/03/06 06:47:54]

Hm, I had assumed that there would never be a permission embargoed under
KILL_SWITCH that was set to "Allow". But I agree if the other stuff is supposed
to get merged this isn't critical. It's split out now, will upload it
separately.

[raymes, 2017/03/06 23:06:52]

Let's chat more about this offline to figure out the best approach :)

[Patti Lor, 2017/03/07 06:31:28]

OK!

+
   if (use_real_combobox)
-    InitializeComboboxView(layout, permission);
+    InitializeComboboxView(layout, permission, user_editable);
   else
-    InitializeMenuButtonView(layout, permission);
+    InitializeMenuButtonView(layout, permission, user_editable);
 }
 
 void PermissionSelectorRow::AddObserver(
     PermissionSelectorRowObserver* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void PermissionSelectorRow::ChildPreferredSizeChanged(View* child) {
   Layout();
 }
 
 PermissionSelectorRow::~PermissionSelectorRow() {
   // Gross. On paper the Combobox and the ComboboxModelAdapter are both owned by
   // this class, but actually, the Combobox is owned by View and will be
   // destroyed in ~View(), which runs *after* ~PermissionSelectorRow() is done,
   // which means the Combobox gets destroyed after its ComboboxModel, which
   // causes an explosion when the Combobox attempts to stop observing the
   // ComboboxModel. This hack ensures the Combobox is deleted before its
   // ComboboxModel.
   //
   // Technically, the MenuButton has the same problem, but MenuButton doesn't
   // use its model in its destructor.
   if (combobox_)
     RemoveChildView(combobox_);
 }
 
 void PermissionSelectorRow::InitializeMenuButtonView(
     views::GridLayout* layout,
-    const WebsiteSettingsUI::PermissionInfo& permission) {
-  bool button_enabled =
-      permission.source == content_settings::SETTING_SOURCE_USER;
+    const WebsiteSettingsUI::PermissionInfo& permission,
+    const bool button_enabled) {
   menu_button_ = new internal::PermissionMenuButton(
       WebsiteSettingsUI::PermissionActionToUIString(
           profile_, permission.type, permission.setting,
           permission.default_setting, permission.source),
       menu_model_.get(), button_enabled);
   menu_button_->SetEnabled(button_enabled);
   menu_button_->SetAccessibleName(
       WebsiteSettingsUI::PermissionTypeToUIString(permission.type));
   layout->AddView(menu_button_);
 }
 
 void PermissionSelectorRow::InitializeComboboxView(
     views::GridLayout* layout,
-    const WebsiteSettingsUI::PermissionInfo& permission) {
-  bool button_enabled =
-      permission.source == content_settings::SETTING_SOURCE_USER;
+    const WebsiteSettingsUI::PermissionInfo& permission,
+    const bool button_enabled) {
   combobox_model_adapter_.reset(
       new internal::ComboboxModelAdapter(menu_model_.get()));
   combobox_ = new internal::PermissionCombobox(
       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) {
+  // TODO(patricialor): Clear embargo state for this permission if the user sets
+  // the permission back to the default setting.
+
   // 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);
 }