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

Side by Side Diff: chrome/browser/resources/extensions_ui.html

Issue 3039005: Fix some issues with extensions: (Closed)
Patch Set: fix host perms Created 10 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
« no previous file with comments | « chrome/browser/extensions/extensions_service.cc ('k') | chrome/common/extensions/extension.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!DOCTYPE HTML> 1 <!DOCTYPE HTML>
2 <html i18n-values="dir:textdirection;"> 2 <html i18n-values="dir:textdirection;">
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 <title i18n-content="title"></title> 5 <title i18n-content="title"></title>
6 <style> 6 <style>
7 body { 7 body {
8 margin: 10px; 8 margin: 10px;
9 min-width: 47em; 9 min-width: 47em;
10 } 10 }
(...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 slidables[i].style.height = 'auto'; 496 slidables[i].style.height = 'auto';
497 497
498 renderTemplate(extensionsData); 498 renderTemplate(extensionsData);
499 499
500 // Explicitly set the height for each element that wants to be 'slid' in and 500 // Explicitly set the height for each element that wants to be 'slid' in and
501 // out when the devModeExpanded is toggled. 501 // out when the devModeExpanded is toggled.
502 var slidables = document.getElementsByClassName('showInDevMode'); 502 var slidables = document.getElementsByClassName('showInDevMode');
503 for (var i = 0; i < slidables.length; i++) 503 for (var i = 0; i < slidables.length; i++)
504 slidables[i].style.height = slidables[i].offsetHeight + 'px'; 504 slidables[i].style.height = slidables[i].offsetHeight + 'px';
505 505
506 // Hide all the incognito warnings that are attached to the wrong extension
507 // ID, which can happen when an extension is added or removed.
508 var warnings = document.getElementsByClassName('incognitoWarning');
509 for (var i = 0; i < warnings.length; i++) {
510 var extension = warnings[i];
511 while (extension.className != "extension")
512 extension = extension.parentNode;
513
514 if (extension.extensionId != warnings[i].attachedExtensionId) {
515 warnings[i].style.display = "none";
516 warnings[i].style.opacity = "0";
517 }
518 }
519
506 // Reset visibility of page based on the current dev mode. 520 // Reset visibility of page based on the current dev mode.
507 document.getElementById('collapse').style.display = 521 document.getElementById('collapse').style.display =
508 devModeExpanded ? 'inline' : 'none'; 522 devModeExpanded ? 'inline' : 'none';
509 document.getElementById('expand').style.display = 523 document.getElementById('expand').style.display =
510 devModeExpanded ? 'none' : 'inline'; 524 devModeExpanded ? 'none' : 'inline';
511 bodyContainer.style.visibility = 'visible'; 525 bodyContainer.style.visibility = 'visible';
512 body.className = devModeExpanded ? 526 body.className = devModeExpanded ?
513 'showDevModeInitial' : 'hideDevModeInitial'; 527 'showDevModeInitial' : 'hideDevModeInitial';
514 528
515 if (rendered_once_) 529 if (rendered_once_)
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
564 var warning = node; 578 var warning = node;
565 579
566 while (warning.className != "extension") 580 while (warning.className != "extension")
567 warning = warning.parentNode; 581 warning = warning.parentNode;
568 582
569 warning = warning.getElementsByClassName("incognitoWarning")[0]; 583 warning = warning.getElementsByClassName("incognitoWarning")[0];
570 if (!node.checked) { 584 if (!node.checked) {
571 warning.style.display = "none"; 585 warning.style.display = "none";
572 warning.style.opacity = "0"; 586 warning.style.opacity = "0";
573 } else { 587 } else {
588 warning.attachedExtensionId = node.extensionId;
574 warning.style.display = "block"; 589 warning.style.display = "block";
575 590
576 // Must set the opacity later. Otherwise, the fact that the display is 591 // Must set the opacity later. Otherwise, the fact that the display is
577 // changing causes the animation to not happen. 592 // changing causes the animation to not happen.
578 window.setTimeout(function() { 593 window.setTimeout(function() {
579 warning.style.opacity = "1"; 594 warning.style.opacity = "1";
580 }, 0); 595 }, 0);
581 } 596 }
582 597
583 chrome.send('enableIncognito', [node.extensionId, String(node.checked)]); 598 chrome.send('enableIncognito', [node.extensionId, String(node.checked)]);
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
798 </div> 813 </div>
799 </div> 814 </div>
800 815
801 <div class="content"> 816 <div class="content">
802 <div class="extension-name no-extensions" jsdisplay="extensions.length = == 0"> 817 <div class="extension-name no-extensions" jsdisplay="extensions.length = == 0">
803 <div i18n-content="noExtensions">NO_EXTENSIONS_ARE_INSTALLED</div> 818 <div i18n-content="noExtensions">NO_EXTENSIONS_ARE_INSTALLED</div>
804 <div i18n-content="suggestGallery" id="try-gallery">TRY_GALLERY</div> 819 <div i18n-content="suggestGallery" id="try-gallery">TRY_GALLERY</div>
805 </div> 820 </div>
806 821
807 <div jsdisplay="extensions.length > 0"> 822 <div jsdisplay="extensions.length > 0">
808 <div class="extension" jsselect="extensions"> 823 <div class="extension" jsselect="extensions" jsvalues=".extensionId:id">
809 <table width="100%" cellpadding="2" cellspacing="0"> 824 <table width="100%" cellpadding="2" cellspacing="0">
810 <tr jsvalues=".className:enabled ? 'extension_enabled' : 'extension_di sabled'"> 825 <tr jsvalues=".className:enabled ? 'extension_enabled' : 'extension_di sabled'">
811 <td width="62" height="50" align="center" valign="top"> 826 <td width="62" height="50" align="center" valign="top">
812 <span jsdisplay="icon"><img jsvalues=".src:icon" width="48" 827 <span jsdisplay="icon"><img jsvalues=".src:icon" width="48"
813 height="48"> 828 height="48">
814 </td> 829 </td>
815 <td valign="top"> 830 <td valign="top">
816 <div> 831 <div>
817 <a jsdisplay="galleryUrl.length > 0" 832 <a jsdisplay="galleryUrl.length > 0"
818 jsvalues=".href:galleryUrl"> 833 jsvalues=".href:galleryUrl">
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
918 </div> 933 </div>
919 </div> 934 </div>
920 935
921 <div id="get-moar-extensions" jsdisplay="extensions.length > 0" 936 <div id="get-moar-extensions" jsdisplay="extensions.length > 0"
922 i18n-content="getMoreExtensions"></div> 937 i18n-content="getMoreExtensions"></div>
923 </div> 938 </div>
924 </div> 939 </div>
925 </div> 940 </div>
926 </body> 941 </body>
927 </html> 942 </html>
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extensions_service.cc ('k') | chrome/common/extensions/extension.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698