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

Side by Side Diff: chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc

Issue 18854021: Making the extension permissions dialog scrollable, when needed (adding expandable sections for thi… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Polishing Created 7 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <gtk/gtk.h> 5 #include <gtk/gtk.h>
6 6
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/extensions/bundle_installer.h" 10 #include "chrome/browser/extensions/bundle_installer.h"
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 if (show_permissions) { 259 if (show_permissions) {
260 GtkWidget* permissions_container; 260 GtkWidget* permissions_container;
261 if (is_inline_install) { 261 if (is_inline_install) {
262 permissions_container = content_vbox; 262 permissions_container = content_vbox;
263 gtk_box_pack_start(GTK_BOX(content_vbox), gtk_hseparator_new(), 263 gtk_box_pack_start(GTK_BOX(content_vbox), gtk_hseparator_new(),
264 FALSE, FALSE, ui::kControlSpacing); 264 FALSE, FALSE, ui::kControlSpacing);
265 } else { 265 } else {
266 permissions_container = left_column_area; 266 permissions_container = left_column_area;
267 } 267 }
268 268
269 if (prompt.GetPermissionCount() > 0) { 269 if (prompt.GetPermissionCount(false) > 0) {
270 GtkWidget* permissions_header = gtk_util::CreateBoldLabel( 270 GtkWidget* permissions_header = gtk_util::CreateBoldLabel(
271 UTF16ToUTF8(prompt.GetPermissionsHeading()).c_str()); 271 UTF16ToUTF8(prompt.GetPermissionsHeading()).c_str());
272 gtk_util::SetLabelWidth(permissions_header, left_column_min_width); 272 gtk_util::SetLabelWidth(permissions_header, left_column_min_width);
273 gtk_box_pack_start(GTK_BOX(permissions_container), permissions_header, 273 gtk_box_pack_start(GTK_BOX(permissions_container), permissions_header,
274 FALSE, FALSE, 0); 274 FALSE, FALSE, 0);
275 275
276 for (size_t i = 0; i < prompt.GetPermissionCount(); ++i) { 276 for (size_t i = 0; i < prompt.GetPermissionCount(false); ++i) {
277 std::string permission = l10n_util::GetStringFUTF8( 277 std::string permission = l10n_util::GetStringFUTF8(
278 IDS_EXTENSION_PERMISSION_LINE, prompt.GetPermission(i)); 278 IDS_EXTENSION_PERMISSION_LINE, prompt.GetPermission(i, false));
279 GtkWidget* permission_label = gtk_label_new(permission.c_str()); 279 GtkWidget* permission_label = gtk_label_new(permission.c_str());
280 gtk_util::SetLabelWidth(permission_label, left_column_min_width); 280 gtk_util::SetLabelWidth(permission_label, left_column_min_width);
281 gtk_box_pack_start(GTK_BOX(permissions_container), permission_label, 281 gtk_box_pack_start(GTK_BOX(permissions_container), permission_label,
282 FALSE, FALSE, kPermissionsPadding); 282 FALSE, FALSE, kPermissionsPadding);
283 } 283 }
284 } else { 284 } else {
285 GtkWidget* permission_label = gtk_label_new(l10n_util::GetStringUTF8( 285 GtkWidget* permission_label = gtk_label_new(l10n_util::GetStringUTF8(
286 IDS_EXTENSION_NO_SPECIAL_PERMISSIONS).c_str()); 286 IDS_EXTENSION_NO_SPECIAL_PERMISSIONS).c_str());
287 gtk_util::SetLabelWidth(permission_label, left_column_min_width); 287 gtk_util::SetLabelWidth(permission_label, left_column_min_width);
288 gtk_box_pack_start(GTK_BOX(permissions_container), permission_label, 288 gtk_box_pack_start(GTK_BOX(permissions_container), permission_label,
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 new chrome::ExtensionInstallDialog(show_params, delegate, prompt); 442 new chrome::ExtensionInstallDialog(show_params, delegate, prompt);
443 } 443 }
444 444
445 } // namespace 445 } // namespace
446 446
447 // static 447 // static
448 ExtensionInstallPrompt::ShowDialogCallback 448 ExtensionInstallPrompt::ShowDialogCallback
449 ExtensionInstallPrompt::GetDefaultShowDialogCallback() { 449 ExtensionInstallPrompt::GetDefaultShowDialogCallback() {
450 return base::Bind(&ShowExtensionInstallDialogImpl); 450 return base::Bind(&ShowExtensionInstallDialogImpl);
451 } 451 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698