diff options
4 files changed, 11 insertions, 3 deletions
diff --git a/chrome/browser/resources/options/clear_browser_data_overlay.html b/chrome/browser/resources/options/clear_browser_data_overlay.html index 722ac96..1d4b99a 100644 --- a/chrome/browser/resources/options/clear_browser_data_overlay.html +++ b/chrome/browser/resources/options/clear_browser_data_overlay.html @@ -53,7 +53,7 @@ </div> </div> <div class="action-area"> - <div> + <div class="flash-plugin-area"> <a target="_blank" i18n-content="flash_storage_settings" i18n-values="href:flash_storage_url"></a> </div> diff --git a/chrome/browser/resources/options/content_settings_exceptions_area.html b/chrome/browser/resources/options/content_settings_exceptions_area.html index fffdd4d..4b77a1a 100644 --- a/chrome/browser/resources/options/content_settings_exceptions_area.html +++ b/chrome/browser/resources/options/content_settings_exceptions_area.html @@ -15,8 +15,10 @@ i18n-content="otr_exceptions_explanation"></span> <list mode="otr"></list> </div> - <a i18n-values="href:flash_storage_url" - i18n-content="flash_storage_settings" target="_blank"></a> + <div class="flash-plugin-area"> + <a i18n-values="href:flash_storage_url" + i18n-content="flash_storage_settings" target="_blank"></a> + </div> </div> <div contentType="images"> diff --git a/chrome/browser/resources/options/options.js b/chrome/browser/resources/options/options.js index a913213..28e5465 100644 --- a/chrome/browser/resources/options/options.js +++ b/chrome/browser/resources/options/options.js @@ -194,6 +194,8 @@ function load() { } if (cr.isViews) document.documentElement.setAttribute('toolkit', 'views'); + if (navigator.plugins['Shockwave Flash']) + document.documentElement.setAttribute('hasFlashPlugin', ''); // Clicking on the Settings title brings up the 'Basics' page. $('settings-title').onclick = function() { diff --git a/chrome/browser/resources/options/options_page.css b/chrome/browser/resources/options/options_page.css index 3d10cd7..95b61cc 100644 --- a/chrome/browser/resources/options/options_page.css +++ b/chrome/browser/resources/options/options_page.css @@ -791,3 +791,7 @@ list.autocomplete-suggestions:not([hasElementFocus]) > [selected], list.autocomplete-suggestions:not([hasElementFocus]) > [lead][selected] { background-color: #bbcee9; } + +html:not([hasFlashPlugin]) .flash-plugin-area { + display: none; +} |