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

Unified Diff: chrome/browser/resources/options/managed_user_settings.html

Issue 14066003: Don't allow elevation for CHROME_OS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bug in set_elevated function. Created 7 years, 8 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
Index: chrome/browser/resources/options/managed_user_settings.html
diff --git a/chrome/browser/resources/options/managed_user_settings.html b/chrome/browser/resources/options/managed_user_settings.html
index a77f56405020f4f8efb20e0cf7652b0c6e764dd6..ea8459d1d30185dc4644c07324d3817cfe24614f 100644
--- a/chrome/browser/resources/options/managed_user_settings.html
+++ b/chrome/browser/resources/options/managed_user_settings.html
@@ -73,21 +73,25 @@
i18n-content="disableHistoryDeletion"></span>
</label>
</div>
- <div class="checkbox">
- <label>
- <input id="use-passphrase-checkbox" type="checkbox">
- <span for="use-passphrase-checkbox"
- i18n-content="usePassphrase"></span>
- </label>
- <button id="set-passphrase" class="link-button"
- i18n-content="setPassphrase">
- </button>
- </div>
+ <if expr="not pp_ifdef('chromeos')">
+ <div class="checkbox">
+ <label>
+ <input id="use-passphrase-checkbox" type="checkbox">
+ <span for="use-passphrase-checkbox"
+ i18n-content="usePassphrase"></span>
+ </label>
+ <button id="set-passphrase" class="link-button"
+ i18n-content="setPassphrase">
+ </button>
+ </div>
+ </if>
</section>
</div>
<div class="action-area">
- <button id="lock-settings" i18n-content="lockSettings"></button>
- <button id="unlock-settings" i18n-content="unlockSettings"></button>
+ <if expr="not pp_ifdef('chromeos')">
+ <button id="lock-settings" i18n-content="lockSettings"></button>
+ <button id="unlock-settings" i18n-content="unlockSettings"></button>
+ </if>
<div id="spacer"></div>
<div class="button-strip">
<button id="managed-user-settings-cancel" type="submit"
« no previous file with comments | « chrome/browser/resources/managed_mode_block_interstitial.js ('k') | chrome/browser/resources/options/managed_user_settings.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698