chrome/browser/resources/options/browser_options.html - Issue 1684063002: Add ArcEnabled policy implementation

Side by Side Diff: chrome/browser/resources/options/browser_options.html

Issue 1684063002: Add ArcEnabled policy implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@26869593

Patch Set: Disable android app section checkbox for managed profiles Created 4 years, 10 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/policy/policy_browsertest.cc ('k') | chrome/browser/resources/options/browser_options.js » ('j') | chrome/browser/resources/options/browser_options.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <div id="settings" class="page" hidden>	1 <div id="settings" class="page" hidden>

2 <header>	2 <header>

3 <h1 i18n-content="settingsTitle"></h1>	3 <h1 i18n-content="settingsTitle"></h1>

4 </header>	4 </header>

5 <include src="automatic_settings_reset_banner.html">	5 <include src="automatic_settings_reset_banner.html">

6 <if expr="chromeos">	6 <if expr="chromeos">

7 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_ico n.html">	7 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_ico n.html">

8 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.h tml">	8 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.h tml">

9 <include src="secondary_user_banner.html">	9 <include src="secondary_user_banner.html">

10 <section id="network-section-cros">	10 <section id="network-section-cros">

(...skipping 204 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
215 </div>	215 </div>

216 <div class="settings-row" id="audio-history-always-on-description">	216 <div class="settings-row" id="audio-history-always-on-description">

217 <span class="setting-extra-description"	217 <span class="setting-extra-description"

218 i18n-content="hotwordAlwaysOnAudioHistoryDescription">	218 i18n-content="hotwordAlwaysOnAudioHistoryDescription">

219 </span>	219 </span>

220 </div>	220 </div>

221 </div>	221 </div>

222 </div>	222 </div>

223 </section>	223 </section>

224 <if expr="chromeos">	224 <if expr="chromeos">

225 <section id="andorid-apps-section" guest-visibility="hidden">	225 <section id="andorid-apps-section" guest-visibility="hidden">
	Thiemo Nagel 2016/02/16 10:37:16 "andorid" doesn't seem right. "andorid" doesn't seem right. Polina Bondarenko 2016/02/16 14:05:02 Done. Show quoted text On 2016/02/16 10:37:16, Thiemo Nagel wrote: > "andorid" doesn't seem right. Done.
226 <h3 i18n-content="androidAppsTitle"></h3>	226 <h3 i18n-content="androidAppsTitle"></h3>

227 <div class="checkbox controlled-setting-with-label">	227 <div class="checkbox controlled-setting-with-label">

228 <label>	228 <label>

229 <input id="android-apps-enabled" pref="arc.enabled"	229 <input id="android-apps-enabled" pref="arc.enabled"

230 metric="Options_AndroidApps" type="checkbox">	230 metric="Options_AndroidApps" type="checkbox">

231 <span>	231 <span>

232 <span i18n-content="androidAppsEnabled"></span>	232 <span i18n-content="androidAppsEnabled"></span>

	233 <span class="controlled-setting-indicator"

	234 pref="arc.enabled"></span>

233 </span>	235 </span>

234 </label>	236 </label>

235 </div>	237 </div>

236 </section>	238 </section>

237 </if>	239 </if>

238 <section id="sync-users-section" guest-visibility="hidden">	240 <section id="sync-users-section" guest-visibility="hidden">

239 <h3 i18n-content="sectionTitleUsers"></h3>	241 <h3 i18n-content="sectionTitleUsers"></h3>

240 <if expr="chromeos">	242 <if expr="chromeos">

241 <include src="sync_section.html">	243 <include src="sync_section.html">

242 </if>	244 </if>

(...skipping 780 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1023 </button>	1025 </button>

1024 </div>	1026 </div>

1025 </section>	1027 </section>

1026 </div> <!-- advanced-settings-container -->	1028 </div> <!-- advanced-settings-container -->

1027 </div> <!-- advanced-settings -->	1029 </div> <!-- advanced-settings -->

1028 <footer id="advanced-settings-footer">	1030 <footer id="advanced-settings-footer">

1029 <a is="action-link" id="advanced-settings-expander"	1031 <a is="action-link" id="advanced-settings-expander"

1030 i18n-content="showAdvancedSettings"></a>	1032 i18n-content="showAdvancedSettings"></a>

1031 </footer>	1033 </footer>

1032 </div>	1034 </div>

OLD	NEW