Add fifth batch of controlled setting indicators

This CL continues the addition of controlled setting indicators to
the Chrome settings UI.

BUG=104955


Review URL: https://chromiumcodereview.appspot.com/11232046

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164055 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 176 insertions, 52 deletions

diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json
index cd188dc..12e8460 100644
--- a/chrome/app/policy/policy_templates.json
+++ b/chrome/app/policy/policy_templates.json
@@ -2424,10 +2424,7 @@
       'type': 'main',
       'schema': { 'type': 'boolean' },
       'supported_on': ['chrome.*:15-'],
-      'features': {
-        'dynamic_refresh': True,
-        'can_be_recommended': True,
-      },
+      'features': {'dynamic_refresh': True},
       'example_value': True,
       'id': 99,
       'caption': '''Import of homepage from default browser on first run''',
@@ -3152,7 +3149,10 @@
       'type': 'main',
       'schema': { 'type': 'boolean' },
       'supported_on': ['chrome.*:22-', 'chrome_os:0.22-'],
-      'features': {'dynamic_refresh': True},
+      'features': {
+        'dynamic_refresh': True,
+        'can_be_recommended': True,
+      },
       'example_value': False,
       'id': 151,
       'caption': '''Enable or disable spell checking web service''',
diff --git a/chrome/browser/resources/options/browser_options.html b/chrome/browser/resources/options/browser_options.html
index cbbac0b..065a28f 100644
--- a/chrome/browser/resources/options/browser_options.html
+++ b/chrome/browser/resources/options/browser_options.html
@@ -69,11 +69,21 @@
             i18n-content="changeHomePage"></button>
       </div>
     </div>
-    <div class="checkbox" guest-visibility="disabled"><label>
-        <input type="checkbox" pref="bookmark_bar.show_on_all_tabs"
+    <div class="checkbox" guest-visibility="disabled">
+      <span class="controlled-setting-with-label">
+        <input id="show-bookmark-bars" type="checkbox"
+            pref="bookmark_bar.show_on_all_tabs"
             metric="Options_ShowBookmarksBar">
-        <span i18n-content="toolbarShowBookmarksBar"></span>
-    </label></div>
+        <span>
+          <label for="show-bookmark-bars"
+              i18n-content="toolbarShowBookmarksBar">
+          </label>
+          <span class="controlled-setting-indicator"
+              pref="bookmark_bar.show_on_all_tabs">
+          </span>
+        </span>
+      </span>
+    </div>
 <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx">
     <div class="checkbox"><label>
         <input id="show-window-decorations" type="checkbox"
@@ -133,14 +143,22 @@
           </button>
         </div>
         <div class="checkbox" guest-visibility="disabled">
-          <label id="instant-label">
+          <span class="controlled-setting-with-label">
             <!-- TODO(estade): metric? -->
             <input id="instant-enabled-control" type="checkbox"
                 pref="instant.enabled" dialog-pref>
-            <!-- TODO(estade) There's a link in here which should not be inside
-                 a <label>. -->
-            <span i18n-values=".innerHTML:instantPrefAndWarning"></span>
-          </label>
+            <span>
+              <!-- TODO(estade) There's a link in here which should not be
+                   inside a <label>. -->
+              <label for="instant-enabled-control"
+                  i18n-values=".innerHTML:instantPrefAndWarning">
+              </label>
+              <span id="instant-enabled-indicator"
+                  class="controlled-setting-indicator" pref="instant.enabled"
+                  dialog-pref>
+              </span>
+            </span>
+          </span>
         </div>
       </div>
   </section>
@@ -281,11 +299,18 @@
       </div>
 <if expr="pp_ifdef('_google_chrome')">
       <div class="checkbox">
-        <label id="spelling-label">
+        <span class="controlled-setting-with-label">
           <input id="spelling-enabled-control" type="checkbox"
               pref="spellcheck.use_spelling_service" dialog-pref>
-          <span i18n-content="spellingPref"></span>
-        </label>
+          <span>
+            <label for="spelling-enabled-control" i18n-content="spellingPref">
+            </label>
+            <span id="spelling-enabled-indicator"
+                class="controlled-setting-indicator"
+                pref="spellcheck.use_spelling_service" dialog-pref>
+            </span>
+          </span>
+        </span>
       </div>
       <div id="metricsReportingSetting" class="checkbox">
         <span class="controlled-setting-with-label">
@@ -451,11 +476,16 @@
           i18n-content="languageAndSpellCheckSettingsButton"></button>
     </div>
     <div class="checkbox">
-      <label>
+      <span class="controlled-setting-with-label">
         <input id="enableTranslate" pref="translate.enabled"
             metric="Options_Translate" type="checkbox">
-        <span i18n-content="translateEnableTranslate"></span>
-      </label>
+        <span>
+          <label for="enableTranslate"i18n-content="translateEnableTranslate">
+          </label>
+          <span class="controlled-setting-indicator" pref="translate.enabled">
+          </span>
+        </span>
+      </span>
     </div>
   </section>
   <section>
@@ -610,11 +640,18 @@
   <section id="background-section">
     <h3 i18n-content="advancedSectionTitleBackground"></h3>
     <div class="checkbox">
-      <label>
+      <span class="controlled-setting-with-label">
         <input id="backgroundModeCheckbox" pref="background_mode.enabled"
             type="checkbox">
-        <span i18n-content="backgroundModeCheckbox"></span>
-      </label>
+        <span>
+          <label for="backgroundModeCheckbox"
+              i18n-content="backgroundModeCheckbox">
+          </label>
+          <span class="controlled-setting-indicator"
+              pref="background_mode.enabled">
+          </span>
+        </span>
+      </span>
     </div>
   </section>
 </if>
diff --git a/chrome/browser/resources/options/import_data_overlay.html b/chrome/browser/resources/options/import_data_overlay.html
index 739a44b..7415dad 100644
--- a/chrome/browser/resources/options/import_data_overlay.html
+++ b/chrome/browser/resources/options/import_data_overlay.html
@@ -11,23 +11,54 @@
       </div>
       <div id="import-checkboxes">
         <div i18n-content="importDescription"></div>
-        <div class="checkbox"><label>
-          <input id="import-history" type="checkbox" pref="import_history">
-          <span for="import-history" i18n-content="importHistory"></span>
-        </label></div>
-        <div class="checkbox"><label>
-          <input id="import-favorites" type="checkbox" pref="import_bookmarks">
-          <span for="import-favorites" i18n-content="importFavorites"></span>
-        </label></div>
-        <div class="checkbox"><label>
-          <input id="import-passwords" type="checkbox"
-              pref="import_saved_passwords">
-          <span i18n-content="importPasswords"></span>
-        </label></div>
-        <div class="checkbox"><label>
-          <input id="import-search" type="checkbox" pref="import_search_engine">
-          <span i18n-content="importSearch"></span>
-        </label></div>
+        <div class="checkbox">
+          <span class="controlled-setting-with-label">
+            <input id="import-history" type="checkbox" pref="import_history">
+            <span>
+              <label for="import-history" i18n-content="importHistory"></label>
+              <span class="controlled-setting-indicator" pref="import_history">
+              </span>
+            </span>
+          </span>
+        </div>
+        <div class="checkbox">
+          <span class="controlled-setting-with-label">
+            <input id="import-favorites" type="checkbox"
+                pref="import_bookmarks">
+            <span>
+              <label for="import-favorites" i18n-content="importFavorites">
+              </label>
+              <span class="controlled-setting-indicator"
+                  pref="import_bookmarks">
+              </span>
+            </span>
+          </span>
+        </div>
+        <div class="checkbox">
+          <span class="controlled-setting-with-label">
+            <input id="import-passwords" type="checkbox"
+                pref="import_saved_passwords">
+            <span>
+              <label for="import-passwords" i18n-content="importPasswords">
+              </label>
+              <span class="controlled-setting-indicator"
+                  pref="import_saved_passwords">
+              </span>
+            </span>
+          </span>
+        </div>
+        <div class="checkbox">
+          <span class="controlled-setting-with-label">
+            <input id="import-search" type="checkbox"
+                pref="import_search_engine">
+            <span>
+              <label for="import-search" i18n-content="importSearch"></label>
+              <span class="controlled-setting-indicator"
+                  pref="import_search_engine">
+              </span>
+            </span>
+          </span>
+        </div>
       </div>
     </div>
     <div class="import-data-success" hidden>
@@ -40,12 +71,19 @@
       <div id="import-find-your-bookmarks">
         <span i18n-content="findYourImportedBookmarks"></span>
         <div class="checkbox">
-          <label>
+          <span class="controlled-setting-with-label">
             <input id="import-data-show-bookmarks-bar"
                 pref="bookmark_bar.show_on_all_tabs"
                 metric="Options_ShowBookmarksBar" type="checkbox">
-            <span i18n-content="toolbarShowBookmarksBar"></span>
-          </label>
+            <span>
+              <label for="import-data-show-bookmarks-bar"
+                  i18n-content="toolbarShowBookmarksBar">
+              </label>
+              <span class="controlled-setting-indicator"
+                  pref="bookmark_bar.show_on_all_tabs">
+              </span>
+            </span>
+          </span>
         </div>
       </div>
     </div>
diff --git a/chrome/test/data/policy/policy_test_cases.json b/chrome/test/data/policy/policy_test_cases.json
index 9d69b7b..6773176 100644
--- a/chrome/test/data/policy/policy_test_cases.json
+++ b/chrome/test/data/policy/policy_test_cases.json
@@ -1257,19 +1257,29 @@
 
   "InstantEnabled": {
     "os": ["win", "linux", "mac", "chromeos"],
+    "can_be_recommended": true,
     "test_policy": { "InstantEnabled": true },
     "settings_pages": ["chrome://settings-frame"],
     "pref_mappings": [
-      { "pref": "instant.enabled" }
+      { "pref": "instant.enabled",
+        "indicator_tests": [
+          { "policy": { "InstantEnabled": true } }
+        ]
+      }
     ]
   },
 
   "TranslateEnabled": {
     "os": ["win", "linux", "mac", "chromeos"],
+    "can_be_recommended": true,
     "test_policy": { "TranslateEnabled": false },
     "settings_pages": ["chrome://settings-frame"],
     "pref_mappings": [
-      { "pref": "translate.enabled" }
+      { "pref": "translate.enabled",
+        "indicator_tests": [
+          { "policy": { "TranslateEnabled": true } }
+        ]
+      }
     ]
   },
 
@@ -1293,10 +1303,15 @@
 
   "BookmarkBarEnabled": {
     "os": ["win", "linux", "mac", "chromeos"],
+    "can_be_recommended": true,
     "test_policy": { "BookmarkBarEnabled": true },
     "settings_pages": ["chrome://settings-frame"],
     "pref_mappings": [
-      { "pref": "bookmark_bar.show_on_all_tabs" }
+      { "pref": "bookmark_bar.show_on_all_tabs",
+        "indicator_tests": [
+          { "policy": { "BookmarkBarEnabled": true } }
+        ]
+      }
     ]
   },
 
@@ -1316,25 +1331,40 @@
     "pref_mappings": [
       { "pref": "select_file_dialogs.allowed",
         "local_state": true
+      },
+      { "pref": "download.prompt_for_download",
+        "indicator_tests": [
+          { "policy": { "AllowFileSelectionDialogs": false } }
+        ]
       }
     ]
   },
 
   "ImportBookmarks": {
     "os": ["win", "mac", "linux"],
+    "can_be_recommended": true,
     "test_policy": { "ImportBookmarks": false },
     "settings_pages": [],
     "pref_mappings": [
-      { "pref": "import_bookmarks" }
+      { "pref": "import_bookmarks",
+        "indicator_tests": [
+          { "policy": { "ImportBookmarks": false } }
+        ]
+      }
     ]
   },
 
   "ImportHistory": {
     "os": ["win", "mac", "linux"],
+    "can_be_recommended": true,
     "test_policy": { "ImportHistory": false },
     "settings_pages": [],
     "pref_mappings": [
-      { "pref": "import_history" }
+      { "pref": "import_history",
+        "indicator_tests": [
+          { "policy": { "ImportHistory": false } }
+        ]
+      }
     ]
   },
 
@@ -1349,19 +1379,29 @@
 
   "ImportSearchEngine": {
     "os": ["win", "mac", "linux"],
+    "can_be_recommended": true,
     "test_policy": { "ImportSearchEngine": false },
     "settings_pages": [],
     "pref_mappings": [
-      { "pref": "import_search_engine" }
+      { "pref": "import_search_engine",
+        "indicator_tests": [
+          { "policy": { "ImportSearchEngine": false } }
+        ]
+      }
     ]
   },
 
   "ImportSavedPasswords": {
     "os": ["win", "mac", "linux"],
+    "can_be_recommended": true,
     "test_policy": { "ImportSavedPasswords": false },
     "settings_pages": [],
     "pref_mappings": [
-      { "pref": "import_saved_passwords" }
+      { "pref": "import_saved_passwords",
+        "indicator_tests": [
+          { "policy": { "ImportSavedPasswords": false } }
+        ]
+      }
     ]
   },
 
@@ -1438,11 +1478,15 @@
 
   "BackgroundModeEnabled": {
     "os": ["win", "linux"],
+    "can_be_recommended": true,
     "test_policy": { "BackgroundModeEnabled": false },
     "settings_pages": ["chrome://settings-frame"],
     "pref_mappings": [
       { "pref": "background_mode.enabled",
-        "local_state": true
+        "local_state": true,
+        "indicator_tests": [
+          { "policy": { "BackgroundModeEnabled": false } }
+        ]
       }
     ]
   },
@@ -1470,10 +1514,15 @@
   "SpellCheckServiceEnabled": {
     "os": ["win", "linux", "mac", "chromeos"],
     "official_only": true,
+    "can_be_recommended": true,
     "test_policy": { "SpellCheckServiceEnabled": false },
     "settings_pages": ["chrome://settings-frame"],
     "pref_mappings": [
-      { "pref": "spellcheck.use_spelling_service" }
+      { "pref": "spellcheck.use_spelling_service",
+        "indicator_tests": [
+          { "policy": { "SpellCheckServiceEnabled": false } }
+        ]
+      }
     ]
   },