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

Unified Diff: chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.cc

Issue 341703003: Make App Info Dialog file permissions middle elided (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Changed method to use two parameters Created 6 years, 6 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 | « chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.cc
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.cc
index c638790de5412a7340be1ac4b20189e97c189ec5..cfb750feb6ce864b9f8005a7050b8367fd45499e 100644
--- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.cc
+++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.cc
@@ -55,7 +55,9 @@ AppInfoPermissionsPanel::~AppInfoPermissionsPanel() {
// Given a list of strings, returns a view containing a list of these strings
// as bulleted items.
views::View* AppInfoPermissionsPanel::CreateBulletedListView(
- const std::vector<base::string16>& messages) {
+ const std::vector<base::string16>& messages,
+ bool allow_multiline,
+ gfx::ElideBehavior elide_behavior) {
const int kSpacingBetweenBulletAndStartOfText = 5;
views::View* list_view = CreateVerticalStack();
@@ -64,7 +66,11 @@ views::View* AppInfoPermissionsPanel::CreateBulletedListView(
++it) {
views::Label* permission_label = new views::Label(*it);
permission_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
- permission_label->SetMultiLine(true);
+
+ if (allow_multiline)
+ permission_label->SetMultiLine(true);
+ else
+ permission_label->SetElideBehavior(elide_behavior);
// Extract only the bullet from the IDS_EXTENSION_PERMISSION_LINE text, and
// place it in it's own view so it doesn't align vertically with the
@@ -101,7 +107,8 @@ void AppInfoPermissionsPanel::CreateActivePermissionsControl() {
} else {
active_permissions_heading_ = CreateHeading(l10n_util::GetStringUTF16(
IDS_APPLICATION_INFO_ACTIVE_PERMISSIONS_TEXT));
- active_permissions_list_ = CreateBulletedListView(permission_strings);
+ active_permissions_list_ =
+ CreateBulletedListView(permission_strings, true, gfx::TRUNCATE);
}
}
@@ -118,8 +125,8 @@ void AppInfoPermissionsPanel::CreateRetainedFilesControl() {
retained_files_heading_ = CreateHeading(l10n_util::GetStringUTF16(
IDS_APPLICATION_INFO_RETAINED_FILE_PERMISSIONS_TEXT));
- retained_files_list_ =
- CreateBulletedListView(retained_file_permission_messages);
+ retained_files_list_ = CreateBulletedListView(
+ retained_file_permission_messages, false, gfx::ELIDE_MIDDLE);
}
}
« no previous file with comments | « chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698