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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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 broken browser tests. 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') | no next file with comments »
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 247 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
258 </div>	258 </div>

259 </div>	259 </div>

260 </section>	260 </section>

261	261

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

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

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

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

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

267 </div>	267 </div>

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

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

270 </div>

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

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

273 </div>	270 </div>

274 </div>	271 </div>

275 </section>	272 </section>

276 </if>	273 </if>

277 <section id="privacy-section">	274 <section id="privacy-section">

278 <h3 i18n-content="advancedSectionTitlePrivacy"></h3>	275 <h3 i18n-content="advancedSectionTitlePrivacy"></h3>

279 <div>	276 <div>

280 <div class="settings-row">	277 <div class="settings-row">

281 <button id="privacyContentSettingsButton"	278 <button id="privacyContentSettingsButton"

282 i18n-content="privacyContentSettingsButton"></button>	279 i18n-content="privacyContentSettingsButton"></button>

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

874 i18n-content="showAdvancedSettings">	871 i18n-content="showAdvancedSettings">

875 </button>	872 </button>

876 <if expr="chromeos">	873 <if expr="chromeos">

877 <button id="version-button" class="link-button" hidden	874 <button id="version-button" class="link-button" hidden

878 i18n-content="browserVersion">	875 i18n-content="browserVersion">

879 </button>	876 </button>

880 </if>	877 </if>

881 </footer>	878 </footer>

882 </div>	879 </div>

OLD	NEW