Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / resources / options / browser_options.html

diff --git a/src/chrome/browser/resources/options/browser_options.html b/src/chrome/browser/resources/options/browser_options.html
index bb23020..ef7df6e 100644 (file)
--- a/src/chrome/browser/resources/options/browser_options.html
+++ b/src/chrome/browser/resources/options/browser_options.html
@@ -2,12 +2,15 @@
   <header>
     <h1 i18n-content="settingsTitle"></h1>
   </header>
-<if expr="not pp_ifdef('chromeos')">
-  <include src="sync_section.html">
-</if>
+  <include src="reset_profile_settings_banner.html">
+  <include src="automatic_settings_reset_banner.html">
 <if expr="pp_ifdef('chromeos')">
+  <include src="secondary_user_banner.html">
   <section>
-    <h3 i18n-content="sectionTitleInternet"></h3>
+    <div id="network-section-header" class="section-header">
+      <h3 i18n-content="sectionTitleInternet"></h3>
+      <span class="controlled-setting-indicator" plural></span>
+    </div>
     <div id="network-settings">
       <list id="network-list"></list>
       <div id="shared-proxies" class="checkbox">
@@ -22,6 +25,7 @@
   </section>
 </if>
 <if expr="not pp_ifdef('chromeos')">
+  <include src="sync_section.html">
   <include src="startup_section.html">
 </if>
   <section>
@@ -81,7 +85,7 @@
         </span>
       </span>
     </div>
-<if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx">
+<if expr="is_posix and not pp_ifdef('chromeos') and not is_macosx">
     <div class="checkbox"><label>
         <input id="show-window-decorations" type="checkbox"
             pref="browser.custom_chrome_frame" metric="Options_CustomFrame"
@@ -109,7 +113,7 @@
           class="settings-row" hidden>
       </div>
       <div class="settings-row">
-        <button id="pointer-settings-button">
+        <button id="pointer-settings-button" hidden>
         </button>
         <button id="keyboard-settings-button"
             i18n-content="keyboardSettingsButtonTitle">
@@ -168,8 +172,8 @@
         i18n-values=".innerHTML:profilesSupervisedDashboardTip" hidden>
     </div>
   </section>
+  <section id="set-default-browser-section">
 <if expr="not pp_ifdef('chromeos')">
-  <section>
     <h3 i18n-content="sectionTitleDefaultBrowser"></h3>
     <div>
       <button id="set-as-default-browser"
@@ -184,8 +188,8 @@
         </label>
       </div>
     </div>
-  </section>
 </if>  <!-- not pp_ifdef('chromeos') -->
+  </section>
 <div id="advanced-settings" hidden>
 <div id="advanced-settings-container">
 <if expr="pp_ifdef('chromeos')">
@@ -271,6 +275,22 @@
       </div>
       <div class="checkbox">
         <span class="controlled-setting-with-label">
+          <input id="safe-browsing-download-feedback-enabled"
+              metric="Options_SafeBrowsingDownloadFeedbackCheckbox"
+              pref="safebrowsing.download_feedback_enabled"
+              type="checkbox">
+          <span>
+            <label for="safe-browsing-download-feedback-enabled"
+                i18n-content="safeBrowsingEnableDownloadFeedback">
+            </label>
+            <span class="controlled-setting-indicator"
+                pref="safebrowsing.download_feedback_enabled">
+            </span>
+          </span>
+        </span>
+      </div>
+      <div class="checkbox">
+        <span class="controlled-setting-with-label">
           <input id="safeBrowsingEnabled" pref="safebrowsing.enabled"
               metric="Options_SafeBrowsingCheckbox" type="checkbox">
           <span>
@@ -351,6 +371,22 @@
         </span>
       </div>
 </if>
+      <div id="hotword-search" hidden>
+        <div class="checkbox">
+          <span class="controlled-setting-with-label">
+            <input id="hotword-search-enable" pref="hotword.search_enabled"
+                metric="Options_HotwordCheckbox" type="checkbox" dialog-pref>
+            <span>
+              <label for="hotword-search-enable"
+                  i18n-values=".innerHTML:hotwordSearchEnable">
+              </label>
+              <span class="controlled-setting-indicator"
+                  pref="hotword.search_enabled" dialog-pref>
+              </span>
+            </span>
+          </span>
+        </div>
+      </div>
     </div>
   </section>
 <if expr="pp_ifdef('chromeos')">
@@ -415,13 +451,6 @@
         </span>
       </span>
     </div>
-    <div class="checkbox" id="password-generation-checkbox">
-      <label>
-        <input id="password-generation-enabled" pref="password_generation.enabled"
-            metric="Options_PasswordGenerationCheckbox" type="checkbox">
-        <span i18n-content="passwordGenerationEnabledDescription"></span>
-      </label>
-    </div>
 <if expr="is_macosx">
     <div id="mac-passwords-warning" i18n-content="macPasswordsWarning" hidden>
     </div>
@@ -480,7 +509,11 @@
 </if>
   <section id="languages-section">
     <h3 i18n-content="advancedSectionTitleLanguages"></h3>
-    <span class="settings-row" i18n-content="languageSectionLabel"></span>
+    <div class="settings-row">
+      <span i18n-content="languageSectionLabel"></span>
+      <a target="_blank" i18n-content="learnMore"
+          i18n-values="href:languagesLearnMoreURL"></a>
+    </div>
     <div class="settings-row">
       <button id="language-button"
           i18n-content="languageAndSpellCheckSettingsButton"></button>
@@ -693,7 +726,7 @@
           </span>
         </div>
       </div>
-      <div id="accessibility-sticky-keys" class="option-name" hidden>
+      <div id="accessibility-sticky-keys" class="option-name">
         <div class="checkbox">
           <span class="controlled-setting-with-label">
             <input id="accessibility-sticky-keys-check"
@@ -723,6 +756,10 @@
               </span>
             </span>
           </span>
+          <div id="accessibility-settings" hidden>
+            <button id="accessibility-settings-button"
+              i18n-content="accessibilitySettings"></button>
+          </div>
         </div>
       </div>
       <div class="option-name">
@@ -790,6 +827,22 @@
           </span>
         </div>
       </div>
+      <div class="option_name" id="accessibility_onscreen_keyboard">
+        <div class="checkbox">
+          <span class="controlled-setting-with-label">
+            <input id="accessibility-virtual-keyboard-check"
+                pref="settings.a11y.virtual_keyboard" type="checkbox">
+            <span>
+              <label for="accessibility-virtual-keyboard-check"
+                  i18n-content="accessibilityVirtualKeyboard">
+              </label>
+              <span class="controlled-setting-indicator"
+                  pref="settings.a11y.virtual_keyboard">
+              </span>
+            </span>
+          </span>
+        </div>
+      </div>
   </section>
 <if expr="pp_ifdef('chromeos')">
   <section id="factory-reset-section" hidden>
@@ -839,7 +892,7 @@
     </div>
   </section>
 </if>
-  <section id="reset-profile-settings-section">
+  <section id="reset-profile-settings-section" hidden>
     <h3 i18n-content="resetProfileSettingsSectionTitle"></h3>
     <div>
       <span class="settings-row" i18n-content="resetProfileSettingsDescription">