diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-08 14:30:41 +0200 |
---|---|---|
committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-12 13:49:54 +0200 |
commit | ab0a50979b9eb4dfa3320eff7e187e41efedf7a9 (patch) | |
tree | 498dfb8a97ff3361a9f7486863a52bb4e26bb898 /chromium/chrome/browser/resources/identity_scope_approval_dialog | |
parent | 4ce69f7403811819800e7c5ae1318b2647e778d1 (diff) | |
download | qtwebengine-chromium-ab0a50979b9eb4dfa3320eff7e187e41efedf7a9.tar.gz |
Update Chromium to beta version 37.0.2062.68
Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/chrome/browser/resources/identity_scope_approval_dialog')
3 files changed, 22 insertions, 17 deletions
diff --git a/chromium/chrome/browser/resources/identity_scope_approval_dialog/manifest.json b/chromium/chrome/browser/resources/identity_scope_approval_dialog/manifest.json index 3de0f8ced67..d6992041915 100644 --- a/chromium/chrome/browser/resources/identity_scope_approval_dialog/manifest.json +++ b/chromium/chrome/browser/resources/identity_scope_approval_dialog/manifest.json @@ -2,14 +2,14 @@ // chrome-extension://ahjaciijnoiaklcomgnblndopackapon "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDNyyvaNmqNZsjBwes4YNlrsy64asdP710pdMUM27jtvOe2YkXUdvglcC6r2ihlvPg16mjYK+ZmvxchcEu497KUPqBq34jXILabiUuXLrQJlvl3A7QMLatuZlijSx1qXL/5w5/ggF2Tblo9SHSVtlVyhwyyGkT9ckga5erBUbbwkQIDAQAB", "name": "Identity API Scope Approval UI", - "version": "1.0", + "version": "1.1", "manifest_version": 2, "description": "Displays scope approval dialog boxes for the Identity API", "permissions": [ + "chrome://theme/", "identityPrivate", - "webview", - "https://*/" + "webview" ], "app": { @@ -17,7 +17,8 @@ "scripts": [ "background.js" ] - } + }, + "content_security_policy": "default-src 'none'; script-src 'self'; style-src 'self'; img-src chrome://theme; object-src 'self'" }, "display_in_launcher": false, "display_in_new_tab_page": false diff --git a/chromium/chrome/browser/resources/identity_scope_approval_dialog/scope_approval_dialog.css b/chromium/chrome/browser/resources/identity_scope_approval_dialog/scope_approval_dialog.css index 9255fd2a2c9..ae5495cc597 100644 --- a/chromium/chrome/browser/resources/identity_scope_approval_dialog/scope_approval_dialog.css +++ b/chromium/chrome/browser/resources/identity_scope_approval_dialog/scope_approval_dialog.css @@ -20,6 +20,9 @@ body { } .titlebar-close-button { + background-image: -webkit-image-set( + url('chrome://theme/IDR_CLOSE_DIALOG') 1x, + url('chrome://theme/IDR_CLOSE_DIALOG@2x') 2x); -webkit-app-region: no-drag; height: 14px; margin: 6px; @@ -28,6 +31,18 @@ body { width: 14px; } +.titlebar-close-button:active { + background-image: -webkit-image-set( + url('chrome://theme/IDR_CLOSE_DIALOG_P') 1x, + url('chrome://theme/IDR_CLOSE_DIALOG_P@2x') 2x); +} + +.titlebar-close-button:hover { + background-image: -webkit-image-set( + url('chrome://theme/IDR_CLOSE_DIALOG_H') 1x, + url('chrome://theme/IDR_CLOSE_DIALOG_H@2x') 2x); +} + .content { height: auto; width: 100%; diff --git a/chromium/chrome/browser/resources/identity_scope_approval_dialog/scope_approval_dialog.js b/chromium/chrome/browser/resources/identity_scope_approval_dialog/scope_approval_dialog.js index 7c23d38a234..b2e5feb1f6a 100644 --- a/chromium/chrome/browser/resources/identity_scope_approval_dialog/scope_approval_dialog.js +++ b/chromium/chrome/browser/resources/identity_scope_approval_dialog/scope_approval_dialog.js @@ -47,19 +47,8 @@ document.addEventListener('DOMContentLoaded', function() { window.close(); }; - chrome.identityPrivate.getResources(function(resources) { - var style = document.styleSheets[0]; - - function insertRule(selector, url) { - style.insertRule(selector + ' { background-image: url(' + url + '); }', - style.cssRules.length); - } - - insertRule('.titlebar-close-button', resources.IDR_CLOSE_DIALOG); - insertRule('.titlebar-close-button:hover', resources.IDR_CLOSE_DIALOG_H); - insertRule('.titlebar-close-button:active', resources.IDR_CLOSE_DIALOG_P); - - document.title = resources.IDS_EXTENSION_PERMISSIONS_PROMPT_TITLE; + chrome.identityPrivate.getStrings(function(strings) { + document.title = strings['window-title']; }); }); |