chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm - Issue 7432006: Add an experimental permissions API for extensions.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm

Issue 7432006: Add an experimental permissions API for extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix clang Created 9 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.h ('k') | chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm

diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm

index 1c8306a2a7a100d79667a9137aace8fcc867c9c2..0e79076f2f8e81e834e3d641e18c01ee23b44332 100644

--- a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm

+++ b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm

@@ -92,6 +92,9 @@ void OffsetControlVertically(NSControl* control, CGFloat amount) {

retain]);

button_.reset([l10n_util::GetNSString(ExtensionInstallUI::kButtonIds[type])

retain]);

+ int cancel_id = ExtensionInstallUI::kAbortButtonIds[type];

+ cancel_button_.reset([l10n_util::GetNSString(

+ cancel_id > 0 ? cancel_id : IDS_CANCEL) retain]);

// We display the warnings as a simple text string, separated by newlines.

if (!warnings.empty()) {

@@ -132,6 +135,7 @@ void OffsetControlVertically(NSControl* control, CGFloat amount) {

[titleField_ setStringValue:title_.get()];

[subtitleField_ setStringValue:subtitle_.get()];

[okButton_ setTitle:button_.get()];

+ [cancelButton_ setTitle:cancel_button_.get()];

NSImage* image = gfx::SkBitmapToNSImage(icon_);

[iconView_ setImage:image];