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

chrome/browser/ui/website_settings/website_settings.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/website_settings/website_settings.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <string>
@@ skipping 14 matching lines @@
 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/content_settings/local_shared_objects_container.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/permissions/chooser_context_base.h"
+#include "chrome/browser/permissions/permission_manager.h"
+#include "chrome/browser/permissions/permission_result.h"
 #include "chrome/browser/permissions/permission_uma_util.h"
 #include "chrome/browser/permissions/permission_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h"
 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h"
 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
 #include "chrome/browser/usb/usb_chooser_context.h"
 #include "chrome/browser/usb/usb_chooser_context_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
@@ skipping 622 matching lines @@
     if (info.primary_pattern == ContentSettingsPattern::Wildcard() &&
         info.secondary_pattern == ContentSettingsPattern::Wildcard()) {
       permission_info.default_setting = permission_info.setting;
       permission_info.setting = CONTENT_SETTING_DEFAULT;
     } else {
       permission_info.default_setting =
           content_settings_->GetDefaultContentSetting(permission_info.type,
                                                       NULL);
     }
 
+    // For permissions that are still prompting the user and haven't been
+    // explicitly set by another source, check its embargo status.
+    if (PermissionUtil::IsPermission(permission_info.type) &&
+        permission_info.setting == CONTENT_SETTING_DEFAULT &&
+        permission_info.source ==
+            content_settings::SettingSource::SETTING_SOURCE_USER) {
+      // TODO(raymes): Use GetPermissionStatus() to retrieve information
+      // about *all* permissions once it has default behaviour implemented for
+      // ContentSettingTypes that aren't permissions.
+      PermissionResult permission_result =
+          PermissionManager::Get(profile_)->GetPermissionStatus(
+              permission_info.type, site_url_, site_url_);
+
+      // If under embargo, update |permission_info| to reflect that.
+      if (permission_result.content_setting == CONTENT_SETTING_BLOCK)

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

I think there are some reasons for correctness to check the source here as we
can't always assume that the result will be due to embargo. I also think it
makes the code clearer - it certainly makes it match up with the comment above.
I chatted with Dom and he was ok leaving it in.

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

Done.

+        permission_info.setting = permission_result.content_setting;
+    }
+
     permission_info_list.push_back(permission_info);
   }
 
   for (const ChooserUIInfo& ui_info : kChooserUIInfo) {
     ChooserContextBase* context = ui_info.get_context(profile_);
     const GURL origin = site_url_.GetOrigin();
     auto chosen_objects = context->GetGrantedObjects(origin, origin);
     for (std::unique_ptr<base::DictionaryValue>& object : chosen_objects) {
       chosen_object_info_list.push_back(
           base::MakeUnique<WebsiteSettingsUI::ChosenObjectInfo>(
@@ skipping 42 matching lines @@
   info.connection_status = site_connection_status_;
   info.connection_status_description =
       UTF16ToUTF8(site_connection_details_);
   info.identity_status = site_identity_status_;
   info.identity_status_description =
       UTF16ToUTF8(site_identity_details_);
   info.certificate = certificate_;
   info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_;
   ui_->SetIdentityInfo(info);
 }