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

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

Issue 2743423004: Permissions: Show the reason for permission decisions made on the user's behalf. (Closed)
Patch Set: Rebase againnn Created 3 years, 9 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/views/page_info/permission_selector_row.cc
diff --git a/chrome/browser/ui/views/page_info/permission_selector_row.cc b/chrome/browser/ui/views/page_info/permission_selector_row.cc
index 3ac5644dc7a03e3b94d7cc4705651792bc4f78c4..871f91eeca9e4c0ea5e6957a7c19efd61545ea72 100644
--- a/chrome/browser/ui/views/page_info/permission_selector_row.cc
+++ b/chrome/browser/ui/views/page_info/permission_selector_row.cc
@@ -253,7 +253,7 @@ PermissionSelectorRow::PermissionSelectorRow(
base::Bind(&PermissionSelectorRow::PermissionChanged,
base::Unretained(this))));
- // Create the permission menu button.
+// Create the permission menu button.
#if defined(OS_MACOSX)
bool use_real_combobox = true;
#else
@@ -264,6 +264,21 @@ PermissionSelectorRow::PermissionSelectorRow(
InitializeComboboxView(layout, permission);
else
InitializeMenuButtonView(layout, permission);
+
+ // Show the permission decision reason, if it was not the user.
dominickn 2017/03/26 23:46:24 Same comment as above
Patti Lor 2017/03/27 05:52:41 Done.
+ base::string16 reason = WebsiteSettingsUI::PermissionDecisionReasonToString(
+ profile, permission, url);
+ if (!reason.empty()) {
+ layout->StartRow(1, 1);
+ layout->SkipColumns(1);
+ views::Label* permission_decision_reason = new views::Label(reason);
+ permission_decision_reason->SetEnabledColor(SK_ColorGRAY);
+ // Long labels should span the remaining width of the row.
+ views::ColumnSet* column_set = layout->GetColumnSet(1);
+ DCHECK(!!column_set);
+ layout->AddView(permission_decision_reason, column_set->num_columns() - 2,
+ 1, views::GridLayout::LEADING, views::GridLayout::CENTER);
+ }
}
void PermissionSelectorRow::AddObserver(

Powered by Google App Engine
This is Rietveld 408576698