[uber page] Merge advanced options page into browser options.

chrome/browser/resources/options2/advanced_options.html

Index: chrome/browser/resources/options2/advanced_options.html
===================================================================
--- chrome/browser/resources/options2/advanced_options.html	(revision 124465)
+++ chrome/browser/resources/options2/advanced_options.html	(working copy)
@@ -1,328 +0,0 @@
-<div id="advancedPage" class="page" hidden>
-  <header>
-    <h1 i18n-content="advancedPage"></h1>
-    <button id="advanced-section-back-button"
-        i18n-content="advancedSectionBackButton"></button>
-  </header>
-<if expr="pp_ifdef('chromeos')">
-  <section>
-    <h3 i18n-content="datetimeTitle"></h3>
-    <div class="option-control-table">
-      <span class="option-name" i18n-content="timezone"></span>
-      <div id="timezone-value">
-        <select id="timezone-select" class="control" i18n-options="timezoneList"
-            data-type="string" pref="cros.system.timezone"></select>
-      </div>
-      <div class="checkbox">
-        <label>
-          <input id="use-24hour-clock" pref="settings.clock.use_24hour_clock"
-              type="checkbox">
-          <span i18n-content="use24HourClock"></span>
-        </label>
-      </div>
-    </div>
-  </section>
-</if>
-  <section>
-    <h3 i18n-content="advancedSectionTitlePrivacy"></h3>
-    <div>
-      <div class="settings-row">
-        <button id="privacyContentSettingsButton"
-            i18n-content="privacyContentSettingsButton"></button>
-        <button id="privacyClearDataButton"
-            i18n-content="privacyClearDataButton"></button>
-      </div>
-      <div id="privacy-explanation" class="settings-row">
-        <span i18n-content="improveBrowsingExperience"
-            class="informational-text">
-        </span>
-        <span i18n-content="disableWebServices"
-            class="informational-text">
-        </span>
-        <a target="_blank" i18n-content="learnMore"
-            i18n-values="href:privacyLearnMoreURL"></a>
-      </div>
-      <div class="checkbox">
-        <label>
-          <input id="alternateErrorPagesEnabled"
-              pref="alternate_error_pages.enabled"
-              metric="Options_LinkDoctorCheckbox" type="checkbox">
-          <span i18n-content="linkDoctorPref"></span>
-        </label>
-      </div>
-      <div class="checkbox">
-        <label>
-          <input id="searchSuggestEnabled" pref="search.suggest_enabled"
-              metric="Options_UseSuggestCheckbox" type="checkbox">
-          <span i18n-content="suggestPref"></span>
-        </label>
-      </div>
-      <div class="checkbox">
-        <label>
-          <input id="dnsPrefetchingEnabled" pref="dns_prefetching.enabled"
-              metric="Options_DnsPrefetchCheckbox" type="checkbox">
-          <span i18n-content="networkPredictionEnabledDescription"></span>
-        </label>
-      </div>
-      <div class="checkbox">
-        <label>
-          <input id="safeBrowsingEnabled" pref="safebrowsing.enabled"
-              metric="Options_SafeBrowsingCheckbox" type="checkbox">
-          <span i18n-content="safeBrowsingEnableProtection"></span>
-        </label>
-      </div>
-<if expr="pp_ifdef('_google_chrome') and pp_ifdef('chromeos')">
-      <div id="metricsReportingSetting" class="checkbox">
-        <label>
-          <input id="metricsReportingEnabled"
-              pref="cros.metrics.reportingEnabled" type="checkbox">
-          <span id="metricsReportingEnabledText"
-              i18n-content="enableLogging">
-          </span>
-        </label>
-      </div>
-</if>
-<if expr="pp_ifdef('_google_chrome') and not pp_ifdef('chromeos')">
-      <div id="metricsReportingSetting" class="checkbox">
-        <label>
-          <input id="metricsReportingEnabled" type="checkbox">
-          <span i18n-content="enableLogging"></span>
-        </label>
-      </div>
-</if>
-<if expr="pp_ifdef('_google_chrome') and not pp_ifdef('chromeos')">
-      <div class="checkbox">
-        <label>
-          <input id="spellingServiceEnabled"
-              pref="spellcheck.use_spelling_service"
-              metric="Options_UseSpellingServiceCheckbox" type="checkbox">
-          <span i18n-content="spellingPref"></span>
-        </label>
-      </div>
-</if>
-    </div>
-  </section>
-  <!-- By default, the bluetooth section is hidden.  It is only
-       visible if the command line flag 'enable_bluetooth' is set
-       and a bluetooth adapter is discovered or emmulating ChromeOS. -->
-<if expr="pp_ifdef('chromeos')">
-  <section id="bluetooth-devices" hidden>
-    <h3 i18n-content="bluetooth"></h3>
-    <div id="bluetooth-options-div">
-      <div class="checkbox">
-        <label>
-          <input type="checkbox" id="enable-bluetooth">
-          <span i18n-content="enableBluetooth">
-        </label>
-      </div>
-      <div class="settings-list bluetooth-device-list" hidden>
-        <list id="bluetooth-paired-devices-list"></list>
-        <div id="bluetooth-paired-devices-list-empty-placeholder"
-            class="bluetooth-empty-list-label" hidden>
-          <span i18n-content="bluetoothNoDevices"></span>
-        </div>
-      </div>
-      <div id="bluetooth-button-group">
-        <button id="bluetooth-add-device"
-            i18n-content="addBluetoothDevice" hidden></button>
-        <button id="bluetooth-reconnect-device"
-            i18n-content="bluetoothConnectDevice" disabled hidden></button>
-      </div>
-    </div>
-  </section>
-</if>
-  <section id="passwords-and-autofill-section">
-    <h3 i18n-content="passwordsAndAutofillGroupName"></h3>
-    <div class="checkbox">
-      <label>
-        <input id="autofill-enabled" pref="autofill.enabled"
-            metric="Options_FormAutofill" type="checkbox">
-        <span i18n-content="autofillEnabled"></span>
-      </label>
-      <button id="autofill-settings" class="link-button"
-          pref="autofill.enabled"
-          i18n-content="manageAutofillSettings"></button>
-    </div>
-    <div class="checkbox">
-      <label>
-        <input id="password-manager-enabled"
-            pref="profile.password_manager_enabled"
-            metric="Options_PasswordManager" type="checkbox">
-        <span i18n-content="passwordManagerEnabled"></span>
-      </label>
-      <button id="manage-passwords" class="link-button"
-          i18n-content="managePasswords"
-          pref="profile.password_manager_enabled"></button>
-    </div>
-    <div id="mac-passwords-warning" i18n-content="macPasswordsWarning" hidden>
-    </div> 
-    <!-- This makes the managed-banner appear when the "pref" is configured by
-         the IT administrator. -->
-    <input name="password_allow_show_hidden" type="text"
-        pref="profile.password_manager_allow_show_passwords" hidden>
-  </section>
-  <section>
-    <h3 i18n-content="advancedSectionTitleContent"></h3>
-    <div>
-      <div class="settings-row">
-        <label class="web-content-select-label">
-          <span i18n-content="defaultFontSizeLabel"></span>
-          <select id="defaultFontSize">
-            <option value="9" i18n-content="fontSizeLabelVerySmall">
-            </option>
-            <option value="12" i18n-content="fontSizeLabelSmall"></option>
-            <option value="16" i18n-content="fontSizeLabelMedium"></option>
-            <option value="20" i18n-content="fontSizeLabelLarge"></option>
-            <option value="24" i18n-content="fontSizeLabelVeryLarge">
-            </option>
-          </select>
-        </label>
-        <button id="fontSettingsCustomizeFontsButton"
-            i18n-content="fontSettingsCustomizeFontsButton"></button>
-      </div>
-      <div class="settings-row">
-        <label class="web-content-select-label">
-          <span i18n-content="defaultZoomFactorLabel"></span>
-          <select id="defaultZoomFactor" dataType="double"></select>
-        </label>
-      </div>
-<if expr="is_macosx">
-      <div class="checkbox">
-        <label>
-          <input id="tabsToLinksPref" pref="webkit.webprefs.tabs_to_links"
-              metric="Options_TabsToLinks" type="checkbox">
-          <span i18n-content="tabsToLinksPref"></span>
-        </label>
-      </div>
-</if>
-    </div>
-  </section>
-<if expr="not pp_ifdef('chromeos')">
-  <section>
-    <h3 i18n-content="advancedSectionTitleNetwork"></h3>
-    <div>
-      <span id="proxiesLabel" class="settings-row"></span>
-      <div class="settings-row">
-        <button id="proxiesConfigureButton"
-            i18n-content="proxiesConfigureButton"></button>
-      </div>
-    </div>
-  </section>
-</if>
-  <section>
-    <h3 i18n-content="advancedSectionTitleLanguages"></h3>
-    <span class="settings-row" i18n-content="languageSectionLabel"></span>
-    <button id="language-button"
-        i18n-content="languageAndSpellCheckSettingsButton"></button>
-    <div class="checkbox">
-      <label>
-        <input id="enableTranslate" pref="translate.enabled"
-            metric="Options_Translate" type="checkbox">
-        <span i18n-content="translateEnableTranslate"></span>
-      </label>
-    </div>
-  </section>
-<if expr="not pp_ifdef('chromeos')">
-  <section>
-    <h3 i18n-content="downloadLocationGroupName"></h3>
-    <div>
-      <div class="settings-row">
-        <label>
-          <span i18n-content="downloadLocationBrowseTitle"></span>
-          <input id="downloadLocationPath" class="weakrtl" type="text"
-              pref="download.default_directory" size="36">
-        </label>
-        <button id="downloadLocationChangeButton"
-            pref="download.prompt_for_download"
-            i18n-content="downloadLocationChangeButton"></button>
-      </div>
-      <div class="checkbox">
-        <label>
-          <input type="checkbox"
-              pref="download.prompt_for_download"
-              metric="Options_AskForSaveLocation">
-          <span i18n-content="downloadLocationAskForSaveLocation"></span>
-        </label>
-      </div>
-      <div id="auto-open-file-types-label" class="settings-row"
-          i18n-content="autoOpenFileTypesInfo"></div>
-      <div class="settings-row">
-        <button id="autoOpenFileTypesResetToDefault"
-            i18n-content="autoOpenFileTypesResetToDefault"></button>
-      </div>
-    </div>
-  </section>
-</if>
-  <section>
-      <h3 i18n-content="advancedSectionTitleSecurity"></h3>
-      <div>
-        <div class="settings-row">
-          <button id="certificatesManageButton"
-              i18n-content="certificatesManageButton"></button>
-        </div>
-        <div class="checkbox">
-          <label>
-            <input id="sslCheckRevocation" type="checkbox">
-            <span i18n-content="sslCheckRevocation"></span>
-          </label>
-        </div>
-      </div>
-    </section>
-<if expr="not pp_ifdef('chromeos')">
-    <section id="cloud-print-connector-section">
-      <h3 i18n-content="advancedSectionTitleCloudPrint"></h3>
-      <div>
-        <span id="cloudPrintConnectorLabel" class="settings-row"
-             i18n-content="cloudPrintConnectorDisabledLabel"></span>
-        <div class="settings-row">
-          <button id="cloudPrintConnectorSetupButton"
-              i18n-content="cloudPrintConnectorDisabledButton"></button>
-          <button id="cloudPrintManageButton"
-              i18n-content="cloudPrintConnectorEnabledManageButton"></button>
-        </div>
-      </div>
-    </section>
-</if>
-<if expr="pp_ifdef('chromeos')">
-  <section id="cloud-print-connector-section">
-    <h3 i18n-content="advancedSectionTitleCloudPrint"></h3>
-    <div>
-      <div>
-        <span i18n-content="cloudPrintChromeosOptionLabel"
-            class="informational-text">
-        </span> 
-        <a target="_blank" i18n-content="learnMore"
-            i18n-values="href:cloudPrintLearnMoreURL"></a>
-      </div>
-      <div class="settings-row">
-        <button id="cloudPrintManageButton"
-                i18n-content="cloudPrintChromeosOptionButton"></button>
-      </div>
-    </div>
-  </section>
-  <section>
-    <h3 i18n-content="accessibilityTitle"></h3>
-    <div class="option-control-table">
-      <div class="option-name">
-        <div class="checkbox">
-          <label>
-            <input id="accessibility-spoken-feedback-check" type="checkbox">
-            <span i18n-content="accessibilitySpokenFeedback"></span>
-          </label>
-        </div>
-      </div>
-    </div>
-  </section>
-</if>
-<if expr="not is_macosx and not pp_ifdef('chromeos')">
-  <section id="background-section">
-    <h3 i18n-content="advancedSectionTitleBackground"></h3>
-    <div class="checkbox">
-      <label>
-        <input id="backgroundModeCheckbox" type="checkbox">
-        <span i18n-content="backgroundModeCheckbox"></span>
-      </label>
-    </div>
-  </section>
-</if>
-</div>