chrome/browser/resources/options/browser_options.html - Issue 11189060: Add controlled setting indicator for proxy configuration

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 11189060: Add controlled setting indicator for proxy configuration (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Re-add accidentally deleted blank line. Created 8 years, 2 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 | Annotate | Revision Log

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 <if expr="not pp_ifdef('chromeos')">	5 <if expr="not pp_ifdef('chromeos')">

6 <include src="sync_section.html">	6 <include src="sync_section.html">

7 </if>	7 </if>

8 <if expr="pp_ifdef('chromeos')">	8 <if expr="pp_ifdef('chromeos')">

9 <section>	9 <section>

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

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

420 </section>	420 </section>

421 <if expr="not pp_ifdef('chromeos')">	421 <if expr="not pp_ifdef('chromeos')">

422 <section>	422 <section>

423 <h3 i18n-content="advancedSectionTitleNetwork"></h3>	423 <h3 i18n-content="advancedSectionTitleNetwork"></h3>

424 <div>	424 <div>

425 <span id="proxiesLabel" class="settings-row"></span>	425 <span id="proxiesLabel" class="settings-row"></span>

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

427 <button id="proxiesConfigureButton"	427 <button id="proxiesConfigureButton"

428 i18n-content="proxiesConfigureButton"></button>	428 i18n-content="proxiesConfigureButton"></button>

	429 <span class="controlled-setting-indicator" pref="proxy" plural></span>

429 </div>	430 </div>

430 </div>	431 </div>

431 </section>	432 </section>

432 </if>	433 </if>

433 <section>	434 <section>

434 <h3 i18n-content="advancedSectionTitleLanguages"></h3>	435 <h3 i18n-content="advancedSectionTitleLanguages"></h3>

435 <span class="settings-row" i18n-content="languageSectionLabel"></span>	436 <span class="settings-row" i18n-content="languageSectionLabel"></span>

436 <div class="settings-row">	437 <div class="settings-row">

437 <button id="language-button"	438 <button id="language-button"

438 i18n-content="languageAndSpellCheckSettingsButton"></button>	439 i18n-content="languageAndSpellCheckSettingsButton"></button>

(...skipping 167 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
606 </section>	607 </section>

607 </if>	608 </if>

608 </div> <!-- advanced-settings-container -->	609 </div> <!-- advanced-settings-container -->

609 </div> <!-- advanced-settings -->	610 </div> <!-- advanced-settings -->

610 <footer>	611 <footer>

611 <button id="advanced-settings-expander" class="link-button"	612 <button id="advanced-settings-expander" class="link-button"

612 i18n-content="showAdvancedSettings">	613 i18n-content="showAdvancedSettings">

613 </button>	614 </button>

614 </footer>	615 </footer>

615 </div>	616 </div>

OLD	NEW

« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/options/controlled_setting.js » ('j') | no next file with comments »