| OLD | NEW |
|---|
| 1 <if expr="not pp_ifdef('chromeos')"> | 1 <if expr="not pp_ifdef('chromeos')"> |
| 2 <section id="sync-section"> | 2 <section id="sync-section"> |
| 3 <h3 i18n-content="sectionTitleSync"></h3> | 3 <h3 i18n-content="sectionTitleSync"></h3> |
| 4 </if> | 4 </if> |
| 5 <if expr="pp_ifdef('chromeos')"> | 5 <if expr="pp_ifdef('chromeos')"> |
| 6 <div id="sync-section"> | 6 <div id="sync-section"> |
| 7 </if> | 7 </if> |
| 8 | 8 |
| 9 <div id="sync-overview" class="settings-row" hidden> | 9 <div id="sync-overview" class="settings-row" hidden> |
| 10 <p i18n-content="syncOverview"></p> | 10 <p i18n-content="syncOverview"></p> |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 </span> | 38 </span> |
| 39 </span> | 39 </span> |
| 40 </span> | 40 </span> |
| 41 </div> | 41 </div> |
| 42 </div> | 42 </div> |
| 43 </if> <!-- pp_ifdef('chromeos') --> | 43 </if> <!-- pp_ifdef('chromeos') --> |
| 44 | 44 |
| 45 <div id="sync-buttons" class="settings-row"> | 45 <div id="sync-buttons" class="settings-row"> |
| 46 <button id="start-stop-sync" hidden></button> | 46 <button id="start-stop-sync" hidden></button> |
| 47 <span id="start-stop-sync-indicator" | 47 <span id="start-stop-sync-indicator" |
| 48 class="controlled-setting-indicator" | 48 class="controlled-setting-indicator" hidden> |
| 49 </span> |
| 50 <button id="customize-sync" i18n-content="customizeSync" |
| 49 pref="sync.managed" hidden> | 51 pref="sync.managed" hidden> |
| 50 </span> | |
| 51 <button id="customize-sync" i18n-content="customizeSync" hidden> | |
| 52 </button> | 52 </button> |
| 53 <if expr="pp_ifdef('chromeos')"> | 53 <if expr="pp_ifdef('chromeos')"> |
| 54 <button id="manage-accounts-button" | 54 <button id="manage-accounts-button" |
| 55 i18n-content="manageAccountsButtonTitle"> | 55 i18n-content="manageAccountsButtonTitle"> |
| 56 </button> | 56 </button> |
| 57 </if> <!-- pp_ifdef('chromeos') --> | 57 </if> <!-- pp_ifdef('chromeos') --> |
| 58 <div id="enable-auto-login-checkbox" class="checkbox" hidden> | 58 <div id="enable-auto-login-checkbox" class="checkbox" hidden> |
| 59 <label> | 59 <label> |
| 60 <input id="enable-auto-login" pref="autologin.enabled" | 60 <input id="enable-auto-login" pref="autologin.enabled" |
| 61 metric="Options_Autologin" type="checkbox"> | 61 metric="Options_Autologin" type="checkbox"> |
| 62 <span i18n-content="autologinEnabled"></span> | 62 <span i18n-content="autologinEnabled"></span> |
| 63 </label> | 63 </label> |
| 64 </div> | 64 </div> |
| 65 </div> | 65 </div> |
| 66 | 66 |
| 67 <if expr="not pp_ifdef('chromeos')"> | 67 <if expr="not pp_ifdef('chromeos')"> |
| 68 </section> | 68 </section> |
| 69 </if> | 69 </if> |
| 70 <if expr="pp_ifdef('chromeos')"> | 70 <if expr="pp_ifdef('chromeos')"> |
| 71 </div> | 71 </div> |
| 72 </if> | 72 </if> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 12077030:
Allow signin to continue even if sync is disabled by policy. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src