chrome/browser/resources/options/browser_options.html - Issue 493613002: Add an enrolling state for consumer management section in settings page.

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

Issue 493613002: Add an enrolling state for consumer management section in settings page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dn

Patch Set: Fixed the unit test. Created 6 years, 3 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/chromeos/policy/consumer_management_service_unittest.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 <include src="secondary_user_banner.html">	7 <include src="secondary_user_banner.html">

8 <section>	8 <section>

9 <div id="network-section-header" class="section-header">	9 <div id="network-section-header" class="section-header">

10 <h3 i18n-content="sectionTitleInternet"></h3>	10 <h3 i18n-content="sectionTitleInternet"></h3>

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

261 </div>	261 </div>

262 </section>	262 </section>

263	263

264 <section id="device-control-section" hidden>	264 <section id="device-control-section" hidden>

265 <h3 i18n-content="deviceControlTitle"></h3>	265 <h3 i18n-content="deviceControlTitle"></h3>

266 <div id="consumer-management-section">	266 <div id="consumer-management-section">

267 <div class="settings-row">	267 <div class="settings-row">

268 <span i18n-content="consumerManagementDescription"></span>	268 <span i18n-content="consumerManagementDescription"></span>

269 </div>	269 </div>

270 <div id="consumer-management-enroll" class="settings-row">	270 <div class="settings-row">

271 <button i18n-content="consumerManagementEnrollButton"></button>	271 <button id="consumer-management-button"></button>

272 </div>

273 <div id="consumer-management-unenroll" class="settings-row" hidden>

274 <button i18n-content="consumerManagementUnenrollButton"></button>

275 </div>	272 </div>

276 </div>	273 </div>

277 </section>	274 </section>

278 </if>	275 </if>

279 <section id="privacy-section">	276 <section id="privacy-section">

280 <h3 i18n-content="advancedSectionTitlePrivacy"></h3>	277 <h3 i18n-content="advancedSectionTitlePrivacy"></h3>

281 <div>	278 <div>

282 <div class="settings-row">	279 <div class="settings-row">

283 <button id="privacyContentSettingsButton"	280 <button id="privacyContentSettingsButton"

284 i18n-content="privacyContentSettingsButton"></button>	281 i18n-content="privacyContentSettingsButton"></button>

(...skipping 691 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
976 <button id="advanced-settings-expander" class="link-button"	973 <button id="advanced-settings-expander" class="link-button"

977 i18n-content="showAdvancedSettings">	974 i18n-content="showAdvancedSettings">

978 </button>	975 </button>

979 <if expr="chromeos">	976 <if expr="chromeos">

980 <button id="version-button" class="link-button" hidden	977 <button id="version-button" class="link-button" hidden

981 i18n-content="browserVersion">	978 i18n-content="browserVersion">

982 </button>	979 </button>

983 </if>	980 </if>

984 </footer>	981 </footer>

985 </div>	982 </div>

OLD	NEW