summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_install_prompt.cc
diff options
context:
space:
mode:
authorsail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-11 03:57:56 +0000
committersail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-11 03:57:56 +0000
commitef2654e46fcda903d5d8397d5f1bd4548da7b6f9 (patch)
tree6c6d05280022be32ab95bca909eb6b3d78e7cd86 /chrome/browser/extensions/extension_install_prompt.cc
parent733a58fc17e9188135cf7e29ac82870e2dd2cddd (diff)
downloadchromium_src-ef2654e46fcda903d5d8397d5f1bd4548da7b6f9.zip
chromium_src-ef2654e46fcda903d5d8397d5f1bd4548da7b6f9.tar.gz
chromium_src-ef2654e46fcda903d5d8397d5f1bd4548da7b6f9.tar.bz2
Cocoa: Show OAuth issues in extension install dialog
This is the Cocoa version of the following two CLs: https://chromiumcodereview.appspot.com/10696042 https://chromiumcodereview.appspot.com/10824054 Currently the extension install dialog shows permission warnings inside a multiline text field. OAuth issues are different in that they are a list of issues, each of which can be expadned to show more details. To support this I replaced the multiline text field with an NSOutlineView. Screenshots: - OAuth issues + Warnings: http://i.imgur.com/Hbag3.png - Inline install + Warnings: http://i.imgur.com/gpLI9.png - Inline + No Warnings (outline view hidden): http://i.imgur.com/se9tH.png - Bundle install + Warnings: http://i.imgur.com/5H3Rm.png XIB changes: Replaced warning and subtitle text field with outline view. Updated relevant outlets. BUG=30206 TEST= 1. Test OAuth issues. Run chrome with --demand-user-scope-approval. Drag/drop oauth2.crx from estade. Verify that warnings and oauth issues are displayed. Verify that expanding a oauth issue grows the dialog. 2. Test Inline install + Warning. Navigate to https://www.google.com/chrome/intl/en/p/google-plus.html and click install. Verify that warnings are displayed. 3. Test Inline Install + No Warnings. Navigate to http://chrome.angrybirds.com/ and click install. Verify that the outline view is hidden and that the dialog is correctly resized. 4. Test Bundle Install. Run chrome with --apps-gallery-url="http://www.corp.google.com/" Navigate to http://www.corp.google.com/~jstritar/bundle.html. Verify that warnings are shown. Review URL: https://chromiumcodereview.appspot.com/10829170 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151187 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_install_prompt.cc')
-rw-r--r--chrome/browser/extensions/extension_install_prompt.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc
index cfbcd5e..8a6136c 100644
--- a/chrome/browser/extensions/extension_install_prompt.cc
+++ b/chrome/browser/extensions/extension_install_prompt.cc
@@ -215,8 +215,7 @@ size_t ExtensionInstallPrompt::Prompt::GetPermissionCount() const {
string16 ExtensionInstallPrompt::Prompt::GetPermission(size_t index) const {
CHECK_LT(index, permissions_.size());
- return l10n_util::GetStringFUTF16(
- IDS_EXTENSION_PERMISSION_LINE, permissions_[index]);
+ return permissions_[index];
}
size_t ExtensionInstallPrompt::Prompt::GetOAuthIssueCount() const {