chrome/browser/resources/options2/browser_options.html - Issue 10544171: Add OptionsUI and its handler for multiple displays.

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

Issue 10544171: Add OptionsUI and its handler for multiple displays. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix Created 8 years, 6 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

« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/options2/browser_options.js » ('j') | chrome/browser/resources/options2/chromeos/display_options.css » ('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 <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 240 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
251 <if expr="not pp_ifdef('chromeos')">	251 <if expr="not pp_ifdef('chromeos')">

252 <input id="metricsReportingEnabled" type="checkbox">	252 <input id="metricsReportingEnabled" type="checkbox">

253 </if>	253 </if>

254 <span i18n-content="enableLogging"></span>	254 <span i18n-content="enableLogging"></span>

255 </label>	255 </label>

256 </div>	256 </div>

257 </if> <!-- pp_ifdef('_google_chrome') -->	257 </if> <!-- pp_ifdef('_google_chrome') -->

258 </div>	258 </div>

259 </section>	259 </section>

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

	261 <!-- By default, the display section is hidden. It is only visible if

	262 more than one display is found. -->

	263 <section id="display-options-section" hidden>

	264 <h3 i18n-content="displayOptionsTitle"></h3>

	265 <div class="settings-row">

	266 <button id="display-options-button"

	267 i18n-content="displayOptionsButton"></button>
	James Hawkins 2012/06/20 16:21:03 nit: Indentation is off. Should be 4 spaces from nit: Indentation is off. Should be 4 spaces from start of previous row. James Hawkins 2012/06/20 16:21:03 nit: If an element wraps, the closing tag must be nit: If an element wraps, the closing tag must be on a new line. Jun Mukai 2012/06/21 08:42:58 Done. Show quoted text On 2012/06/20 16:21:03, James Hawkins wrote: > nit: Indentation is off. Should be 4 spaces from start of previous row. Done. Jun Mukai 2012/06/21 08:42:58 Done. Show quoted text On 2012/06/20 16:21:03, James Hawkins wrote: > nit: If an element wraps, the closing tag must be on a new line. Done.
	268 </div>

	269 </section>

	270
	James Hawkins 2012/06/20 16:21:03 nit: Remove blank line. nit: Remove blank line. Jun Mukai 2012/06/21 08:42:58 Done. Show quoted text On 2012/06/20 16:21:03, James Hawkins wrote: > nit: Remove blank line. Done.
261 <!-- By default, the bluetooth section is hidden. It is only visible if a	271 <!-- By default, the bluetooth section is hidden. It is only visible if a

262 bluetooth adapter is discovered -->	272 bluetooth adapter is discovered -->

263 <section id="bluetooth-devices" hidden>	273 <section id="bluetooth-devices" hidden>

264 <h3 i18n-content="bluetooth"></h3>	274 <h3 i18n-content="bluetooth"></h3>

265 <div id="bluetooth-options-div">	275 <div id="bluetooth-options-div">

266 <div class="checkbox">	276 <div class="checkbox">

267 <label>	277 <label>

268 <input type="checkbox" id="enable-bluetooth">	278 <input type="checkbox" id="enable-bluetooth">

269 <span i18n-content="enableBluetooth">	279 <span i18n-content="enableBluetooth">

270 </label>	280 </label>

(...skipping 241 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
512 </section>	522 </section>

513 </if>	523 </if>

514 </div> <!-- advanced-settings-container -->	524 </div> <!-- advanced-settings-container -->

515 </div> <!-- advanced-settings -->	525 </div> <!-- advanced-settings -->

516 <footer>	526 <footer>

517 <button id="advanced-settings-expander" class="link-button"	527 <button id="advanced-settings-expander" class="link-button"

518 i18n-content="showAdvancedSettings">	528 i18n-content="showAdvancedSettings">

519 </button>	529 </button>

520 </footer>	530 </footer>

521 </div>	531 </div>

OLD	NEW