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

Unified Diff: chrome/app/generated_resources.grd

Issue 7310003: Disable chrome://options UI elements if the corresponding preference is not user-modifiable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 6addf663c4d2ff88e6a62f95bfd27bad0454f83e..d162bafceedc506790e4549e13f31ba480af7b7b 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -7788,6 +7788,22 @@ Keep your key file in a safe place. You will need it to create new versions of y
</if>
<if expr="pp_ifdef('chromeos')">
+ <message name="IDS_OPTIONS_EXTENSION_MANAGED_PREFS" desc="ChromeOS tooltip displayed for an extension-managed option the user won't be able to change.">
+ This setting is managed by an extension.
+ </message>
+ </if>
+ <if expr="not pp_ifdef('chromeos') and is_posix">
+ <message name="IDS_OPTIONS_EXTENSION_MANAGED_PREFS" desc="Mac/Linux tooltip displayed for an extension-managed option the user won't be able to change.">
+ This preference is managed by an extension.
+ </message>
+ </if>
+ <if expr="os == 'win32'">
+ <message name="IDS_OPTIONS_EXTENSION_MANAGED_PREFS" desc="Windows tooltip displayed for an extension-managed option the user won't be able to change.">
+ This option is managed by an extension.
+ </message>
+ </if>
+
+ <if expr="pp_ifdef('chromeos')">
<message name="IDS_OPTIONS_MANAGED_PREFS" desc="ChromeOS banner displayed in case there are managed options the user won't be able to change.">
Some settings have been disabled by your IT administrator.
</message>
« no previous file with comments | « no previous file | chrome/browser/resources/options/content_settings.html » ('j') | chrome/browser/resources/options/pref_ui.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698